From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id ABC3E1FF16B for ; Thu, 14 Nov 2024 15:42:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D087032C0D; Thu, 14 Nov 2024 15:42:31 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 14 Nov 2024 15:41:10 +0100 Message-Id: <20241114144114.375987-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241114144114.375987-1-c.ebner@proxmox.com> References: <20241114144114.375987-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] Subject: [pbs-devel] [PATCH v2 proxmox-backup 1/5] client: pxar: refactor report vanished/changed helpers X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Switch from mutable reference to shared reference on `self` and drop unused return value. These helpers only write log messages, there is currently no need for a mutable reference to `self`, nor to return a `Result`. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version pbs-client/src/pxar/create.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index c0c492f8d..4d1883118 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -476,7 +476,7 @@ impl Archiver { Ok(fd) => Ok(Some(fd)), Err(Errno::ENOENT) => { if existed { - self.report_vanished_file()?; + self.report_vanished_file(); } Ok(None) } @@ -671,25 +671,22 @@ impl Archiver { Ok(file_list) } - fn report_vanished_file(&mut self) -> Result<(), Error> { + fn report_vanished_file(&self) { log::warn!("warning: file vanished while reading: {:?}", self.path); - Ok(()) } - fn report_file_shrunk_while_reading(&mut self) -> Result<(), Error> { + fn report_file_shrunk_while_reading(&self) { log::warn!( "warning: file size shrunk while reading: {:?}, file will be padded with zeros!", self.path, ); - Ok(()) } - fn report_file_grew_while_reading(&mut self) -> Result<(), Error> { + fn report_file_grew_while_reading(&self) { log::warn!( "warning: file size increased while reading: {:?}, file will be truncated!", self.path, ); - Ok(()) } async fn add_entry( @@ -1239,14 +1236,14 @@ impl Archiver { Err(err) => bail!(err), }; if got as u64 > remaining { - self.report_file_grew_while_reading()?; + self.report_file_grew_while_reading(); got = remaining as usize; } out.write_all(&self.file_copy_buffer[..got]).await?; remaining -= got as u64; } if remaining > 0 { - self.report_file_shrunk_while_reading()?; + self.report_file_shrunk_while_reading(); let to_zero = remaining.min(self.file_copy_buffer.len() as u64) as usize; vec::clear(&mut self.file_copy_buffer[..to_zero]); while remaining != 0 { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel