From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CB91D1FF13B for ; Wed, 06 May 2026 13:51:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A27411E6EE; Wed, 6 May 2026 13:51:07 +0200 (CEST) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v1 proxmox-backup 1/3] client: pxar: improve variable names Date: Wed, 6 May 2026 13:49:24 +0200 Message-ID: <20260506115016.171006-2-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260506115016.171006-1-r.obkircher@proxmox.com> References: <20260506115016.171006-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778068122838 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.058 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.rs] Message-ID-Hash: OC3XAGX22GRBBXYNQZJQF6AAESQKM3PG X-Message-ID-Hash: OC3XAGX22GRBBXYNQZJQF6AAESQKM3PG X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The Option can hold at most one result, and the closure computes more than just the mode. Signed-off-by: Robert Obkircher --- pbs-client/src/pxar/create.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index d18021c4c..08c5c9b44 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -676,9 +676,9 @@ impl Archiver { let match_path = PathBuf::from("/").join(full_path.clone()); - let mut stat_results: Option = None; + let mut stat_result: Option = None; - let get_file_mode = || { + let do_stat = || { nix::sys::stat::fstatat( Some(dir_fd), file_name, @@ -689,9 +689,9 @@ impl Archiver { let match_result = self .patterns .matches(match_path.as_os_str().as_bytes(), || { - Ok::<_, Errno>(match &stat_results { + Ok::<_, Errno>(match &stat_result { Some(result) => result.st_mode, - None => stat_results.insert(get_file_mode()?).st_mode, + None => stat_result.insert(do_stat()?).st_mode, }) }); @@ -711,10 +711,10 @@ impl Archiver { } } - let stat = match stat_results { - Some(mode) => mode, - None => match get_file_mode() { - Ok(mode) => mode, + let stat = match stat_result { + Some(stat) => stat, + None => match do_stat() { + Ok(stat) => stat, Err(Errno::ESTALE) => { self.report_stale_file_handle(Some(&full_path)); continue; -- 2.47.3