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 9AB1461E27 for ; Fri, 18 Dec 2020 12:38:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E3D2B2F93E for ; Fri, 18 Dec 2020 12:37:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 2BEAE2F836 for ; Fri, 18 Dec 2020 12:37:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3F39345380 for ; Fri, 18 Dec 2020 12:26:17 +0100 (CET) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Fri, 18 Dec 2020 12:25:49 +0100 Message-Id: <20201218112608.6845-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201218112608.6845-1-w.bumiller@proxmox.com> References: <20201218112608.6845-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [read.rs] Subject: [pbs-devel] [PATCH proxmox 01/18] formatting fixup 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: Fri, 18 Dec 2020 11:38:12 -0000 Signed-off-by: Wolfgang Bumiller --- proxmox/src/tools/io/read.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/proxmox/src/tools/io/read.rs b/proxmox/src/tools/io/read.rs index 9bba54b..eed96b7 100644 --- a/proxmox/src/tools/io/read.rs +++ b/proxmox/src/tools/io/read.rs @@ -298,17 +298,21 @@ impl ReadExt for R { loop { match self.read(&mut buf) { Ok(0) => { - if read_bytes == 0 { return Ok(false); } + if read_bytes == 0 { + return Ok(false); + } return Err(io::Error::new( io::ErrorKind::UnexpectedEof, - "failed to fill whole buffer") - ); + "failed to fill whole buffer", + )); } - Ok(n) => { + Ok(n) => { let tmp = buf; buf = &mut tmp[n..]; read_bytes += n; - if buf.is_empty() { return Ok(true); } + if buf.is_empty() { + return Ok(true); + } } Err(ref e) if e.kind() == std::io::ErrorKind::Interrupted => {} Err(e) => return Err(e), @@ -318,7 +322,7 @@ impl ReadExt for R { fn skip_to_end(&mut self) -> io::Result { let mut skipped_bytes = 0; - let mut buf = unsafe { vec::uninitialized(32*1024) }; + let mut buf = unsafe { vec::uninitialized(32 * 1024) }; loop { match self.read(&mut buf) { Ok(0) => return Ok(skipped_bytes), -- 2.20.1