From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id SRBgC/2cu2p1EhcAWB0awg (envelope-from ) for ; Tue, 29 Sep 2026 07:11:57 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=G8ZB8jm0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqqXxsZ7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dWBLQRL5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hStamJ+s; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2460B1E06B; Tue, 29 Sep 2026 07:11:57 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 244051E033 for ; Tue, 29 Sep 2026 07:11:56 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BE9DC4BB24E8 for ; Tue, 29 Sep 2026 11:11:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE9DC4BB24E8 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=G8ZB8jm0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqqXxsZ7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dWBLQRL5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hStamJ+s Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 185A54BAE7DA for ; Tue, 29 Sep 2026 11:09:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 185A54BAE7DA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 185A54BAE7DA Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790680172; cv=none; b=UgkoHpAkiQX6bnY3otZqWFVX7HckSvarg+QvpGR799Jk3MPEpPgTVQ1S6UN+Ks6wpLyh1mZfbjVuNxllJk3lia8IEvClJNJvGi31xLBRPNtu8XlysP9679TSFXCFIa44mvQfGmQ1UsdWXkx8JrZzCUgk/dFnSd5aDgQXIOeSE6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1790680172; c=relaxed/simple; bh=JDNSXcRAsZNJocLxaE5hV3eaG59KU91VhZbA97XEWW4=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Ng4+dgRm97Ni/urMtQHkXrrjuyfI5TvmeI+lYb9UMRbMEpN3/WJ66ptIudpVsbfbTgzexYsFm1jgu6N/v80JOQAcoH3eB2VdYgWje3roU5+yxmubw11JZzWlD23U8/WmbI8McezQU2MBbzESVeWkKhYwFmk9iv2H99K9C9v0Y4w= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=G8ZB8jm0; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=FqqXxsZ7; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=dWBLQRL5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=hStamJ+s DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 185A54BAE7DA Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 5DBF921C1A for ; Tue, 29 Sep 2026 11:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790680166; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UEEmC0vQNtjjeQrA+nQCRGK0ON183O/PLgnOLrwmmMA=; b=G8ZB8jm04toaZTn9qSKJtKYaEkFVj9kFriq9kZQbA0OYdg7h6iQhdmGh1gHSkaQfpxeFSj 939Z58rYtAkZ97B8+X363a7MZ9WGw7jBHT7imhIxXkhyta2l+CuME6hZVyGch/wg8j8DCV tW07qNf4sG3EleLGLNsSeMYJB7/9b7E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790680166; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UEEmC0vQNtjjeQrA+nQCRGK0ON183O/PLgnOLrwmmMA=; b=FqqXxsZ733oT7UJgD7KU8OfZb/9a98J7awtWuGhX1aSpGx98QRlwnkwVeyAMQJP0snzDBa nDDMItdcMW53fNDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1790680162; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UEEmC0vQNtjjeQrA+nQCRGK0ON183O/PLgnOLrwmmMA=; b=dWBLQRL5XqWxl66P+NccdiXBPYSl5mhMcJ3YETvatI+UAJK3rAfcoNht23UXve8jH1mmsu aI/VKoGCH6O+dGkN0dmyA9Z5NdKBMuF4TsVl2kxvl9uVoyXuq+tGkc0gxFgk5u+4Fsr1Wd ePmhVOmq7Q6gyGBpcBrVbKiULKRYqE4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1790680162; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UEEmC0vQNtjjeQrA+nQCRGK0ON183O/PLgnOLrwmmMA=; b=hStamJ+sQiJ7EmojFjT1N93sbBUtqoJ4l4pO2dKapF3AxmIju/oO/F4/rjNOjinW4oOTpf /CuxwJzIrlOfeyCQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 279F5136F7 for ; Tue, 29 Sep 2026 11:09:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id jiAQNGGcu2oIAgAAD6G6ig:T2 (envelope-from ) for ; Tue, 29 Sep 2026 11:09:22 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/6] [gdb/testsuite] Improve variable names in lock_file_{acquire, release} Date: Tue, 29 Sep 2026 13:09:17 +0200 Message-ID: <20260929110921.1910094-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260929110921.1910094-1-tdevries@suse.de> References: <20260929110921.1910094-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-1.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.993]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org In lock_file_acquire we assign the result of a call to proc open to a variable called rc. Use fh for file handle instead. Then use the variable names fh and lockfile as used in lock_file_acquire in lock_file_release. --- gdb/testsuite/lib/gdb-utils.exp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp index 5d6165f9ba3..56d8e80f152 100644 --- a/gdb/testsuite/lib/gdb-utils.exp +++ b/gdb/testsuite/lib/gdb-utils.exp @@ -188,14 +188,14 @@ proc lock_file_acquire {lockfile} { while {true} { try { open $lockfile {WRONLY CREAT EXCL} - } on ok {rc} { + } on ok {fh} { set msg "locked by $::subdir/${::gdb_test_file_name}.exp" verbose -log "lock file: $msg" # For debugging, put info in the lockfile about who owns # it. - puts $rc $msg - flush $rc - return [list $rc $lockfile] + puts $fh $msg + flush $fh + return [list $fh $lockfile] } on error {} { # Ignore and try again. } @@ -208,17 +208,20 @@ proc lock_file_acquire {lockfile} { proc lock_file_release {info} { verbose -log "releasing lock file: $::subdir/${::gdb_test_file_name}.exp" + set fh [lindex $info 0] + set lockfile [lindex $info 1] + try { - fconfigure [lindex $info 0] + fconfigure $fh } on error {} { error "invalid lock" } try { - close [lindex $info 0] - file delete -force [lindex $info 1] - } on error {rc} { - error "Error releasing lockfile: '$rc'" + close $fh + file delete -force $lockfile + } on error {err_msg} { + error "Error releasing lockfile: '$err_msg'" } return "" -- 2.51.0