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 57CD177DD8 for ; Wed, 21 Jul 2021 16:05:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 42F271608A for ; Wed, 21 Jul 2021 16:04:54 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1EFF11605D for ; Wed, 21 Jul 2021 16:04:52 +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 B7EEA42368 for ; Wed, 21 Jul 2021 16:04:51 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 21 Jul 2021 16:04:49 +0200 Message-Id: <20210721140451.1839470-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210721140451.1839470-1-d.csapak@proxmox.com> References: <20210721140451.1839470-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.550 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pbs-devel] [PATCH proxmox-backup 2/4] tape: changer: sg_pt: add SCSI_VOLUME_TAG_LEN const 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, 21 Jul 2021 14:05:24 -0000 so that we do have less 'magic' constants without description Signed-off-by: Dominik Csapak --- src/tape/changer/sg_pt_changer.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs index f4154ced..908311b0 100644 --- a/src/tape/changer/sg_pt_changer.rs +++ b/src/tape/changer/sg_pt_changer.rs @@ -33,6 +33,7 @@ use crate::{ }; const SCSI_CHANGER_DEFAULT_TIMEOUT: usize = 60*5; // 5 minutes +const SCSI_VOLUME_TAG_LEN: usize = 36; /// Initialize element status (Inventory) pub fn initialize_element_status(file: &mut F) -> Result<(), Error> { @@ -509,7 +510,7 @@ impl SubHeader { ) -> Result, Error> { if (self.flags & 128) != 0 { // has PVolTag - let tmp = reader.read_exact_allocated(36)?; + let tmp = reader.read_exact_allocated(SCSI_VOLUME_TAG_LEN)?; if full { let volume_tag = scsi_ascii_to_string(&tmp); return Ok(Some(volume_tag)); @@ -526,7 +527,7 @@ impl SubHeader { ) -> Result, Error> { if (self.flags & 64) != 0 { // has AVolTag - let _tmp = reader.read_exact_allocated(36)?; + let _tmp = reader.read_exact_allocated(SCSI_VOLUME_TAG_LEN)?; } Ok(None) -- 2.30.2