From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D3F1E9100A for ; Wed, 3 Apr 2024 11:18:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B46D014B2D for ; Wed, 3 Apr 2024 11:18:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 3 Apr 2024 11:18:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DC72C44D00 for ; Wed, 3 Apr 2024 11:18:06 +0200 (CEST) Date: Wed, 03 Apr 2024 11:18:00 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240328123707.336951-1-c.ebner@proxmox.com> <20240328123707.336951-5-c.ebner@proxmox.com> In-Reply-To: <20240328123707.336951-5-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1712135728.jh9t8d6l3v.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.059 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. [proxmox.com, mod.rs] Subject: Re: [pbs-devel] [PATCH v3 pxar 04/58] 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: , X-List-Received-Date: Wed, 03 Apr 2024 09:18:07 -0000 On March 28, 2024 1:36 pm, Christian Ebner wrote: > Make the skip part reusable for a different input. >=20 > In preparation for skipping payload paddings in a separated input. >=20 > Signed-off-by: Christian Ebner > --- > changes since version 2: > - not present in previous version >=20 > src/decoder/mod.rs | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs > index cc50e4f..f439327 100644 > --- a/src/decoder/mod.rs > +++ b/src/decoder/mod.rs > @@ -563,15 +563,19 @@ impl DecoderImpl { > // > =20 > async fn skip_entry(&mut self, offset: u64) -> io::Result<()> { > - let mut len =3D self.current_header.content_size() - offset; > + let len =3D (self.current_header.content_size() - offset) as usi= ze; > + Self::skip(&mut self.input, len).await > + } > + > + async fn skip(input: &mut I, len: usize) -> io::Result<()> { > + let mut len =3D len; nit: this re-binding could just be part of the fn signature ;) > let scratch =3D scratch_buffer(); > - while len >=3D (scratch.len() as u64) { > - seq_read_exact(&mut self.input, scratch).await?; > - len -=3D scratch.len() as u64; > + while len >=3D (scratch.len()) { > + seq_read_exact(input, scratch).await?; > + len -=3D scratch.len(); > } > - let len =3D 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(()) > } > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20