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 898261FF39E for ; Mon, 27 May 2024 16:34:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2ED69555C; Mon, 27 May 2024 16:34:14 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 27 May 2024 16:32:15 +0200 Message-Id: <20240527143323.456002-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240527143323.456002-1-c.ebner@proxmox.com> References: <20240527143323.456002-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v7 pxar 01/69] decoder: factor out skip part from skip_entry 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" Make the skip part reusable for a different input. In preparation for skipping payload paddings in a separated input. Signed-off-by: Christian Ebner --- changes since version 6: - no changes, patch reorderd src/decoder/mod.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index d1fb911..3c6d9ef 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -563,15 +563,18 @@ impl DecoderImpl { // async fn skip_entry(&mut self, offset: u64) -> io::Result<()> { - let mut len = self.current_header.content_size() - offset; + let len = (self.current_header.content_size() - offset) as usize; + Self::skip(&mut self.input, len).await + } + + async fn skip(input: &mut I, mut len: usize) -> io::Result<()> { let scratch = scratch_buffer(); - while len >= (scratch.len() as u64) { - seq_read_exact(&mut self.input, scratch).await?; - len -= scratch.len() as u64; + while len >= (scratch.len()) { + seq_read_exact(input, scratch).await?; + len -= scratch.len(); } - let len = len as usize; if len > 0 { - seq_read_exact(&mut self.input, &mut scratch[..len]).await?; + seq_read_exact(input, &mut scratch[..len]).await?; } Ok(()) } -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel