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 DDF7F1FF165 for ; Wed, 29 Jan 2025 11:42:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B53D61F8C2; Wed, 29 Jan 2025 11:42:53 +0100 (CET) From: Stefan Hanreich To: pbs-devel@lists.proxmox.com Date: Wed, 29 Jan 2025 11:42:50 +0100 Message-Id: <20250129104250.934927-3-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250129104250.934927-1-s.hanreich@proxmox.com> References: <20250129104250.934927-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.240 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods 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. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [main.rs, pmt.rs] Subject: [pbs-devel] [PATCH proxmox-backup 3/3] api: change integer schema parameters to i64 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" The type for the minimum / maximum / default values for integer schemas has changed to i64 (from isize). Fix all call sites that are converting to isize to convert to i64 instead. Signed-off-by: Stefan Hanreich --- pbs-tape/src/bin/pmt.rs | 6 +++--- proxmox-backup-client/src/main.rs | 2 +- pxar-bin/src/main.rs | 6 +++--- src/api2/backup/upload_chunk.rs | 15 ++++++--------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pbs-tape/src/bin/pmt.rs b/pbs-tape/src/bin/pmt.rs index 9e39dbe1..685fa835 100644 --- a/pbs-tape/src/bin/pmt.rs +++ b/pbs-tape/src/bin/pmt.rs @@ -29,17 +29,17 @@ use pbs_tape::{ pub const FILE_MARK_COUNT_SCHEMA: Schema = IntegerSchema::new("File mark count.") .minimum(1) - .maximum(i32::MAX as isize) + .maximum(i32::MAX as i64) .schema(); pub const FILE_MARK_POSITION_SCHEMA: Schema = IntegerSchema::new("File mark position (0 is BOT).") .minimum(0) - .maximum(i32::MAX as isize) + .maximum(i32::MAX as i64) .schema(); pub const RECORD_COUNT_SCHEMA: Schema = IntegerSchema::new("Record count.") .minimum(1) - .maximum(i32::MAX as isize) + .maximum(i32::MAX as i64) .schema(); pub const DRIVE_OPTION_SCHEMA: Schema = diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 589a097b..3666a313 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -718,7 +718,7 @@ fn spawn_catalog_upload( type: Integer, description: "Max number of entries to hold in memory.", optional: true, - default: pbs_client::pxar::ENCODER_MAX_ENTRIES as isize, + default: pbs_client::pxar::ENCODER_MAX_ENTRIES as i64, }, "dry-run": { type: Boolean, diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 7dff1e38..d0742f6b 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -330,9 +330,9 @@ fn extract_archive( "entries-max": { description: "Max number of entries loaded at once into memory", optional: true, - default: ENCODER_MAX_ENTRIES as isize, + default: ENCODER_MAX_ENTRIES as i64, minimum: 0, - maximum: isize::MAX, + maximum: i64::MAX, }, "payload-output": { description: "'ppxar' payload output data file to create split archive.", @@ -354,7 +354,7 @@ async fn create_archive( no_fifos: bool, no_sockets: bool, exclude: Option>, - entries_max: isize, + entries_max: i64, payload_output: Option, ) -> Result<(), Error> { let patterns = { diff --git a/src/api2/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs index 20259660..ca22efbd 100644 --- a/src/api2/backup/upload_chunk.rs +++ b/src/api2/backup/upload_chunk.rs @@ -133,10 +133,9 @@ pub const API_METHOD_UPLOAD_FIXED_CHUNK: ApiMethod = ApiMethod::new( "encoded-size", false, &IntegerSchema::new("Encoded chunk size.") - .minimum((std::mem::size_of::() as isize) + 1) + .minimum((std::mem::size_of::() as i64) + 1) .maximum( - 1024 * 1024 * 16 - + (std::mem::size_of::() as isize) + 1024 * 1024 * 16 + (std::mem::size_of::() as i64) ) .schema() ), @@ -202,10 +201,9 @@ pub const API_METHOD_UPLOAD_DYNAMIC_CHUNK: ApiMethod = ApiMethod::new( "encoded-size", false, &IntegerSchema::new("Encoded chunk size.") - .minimum((std::mem::size_of::() as isize) + 1) + .minimum((std::mem::size_of::() as i64) + 1) .maximum( - 1024 * 1024 * 16 - + (std::mem::size_of::() as isize) + 1024 * 1024 * 16 + (std::mem::size_of::() as i64) ) .schema() ), @@ -290,10 +288,9 @@ pub const API_METHOD_UPLOAD_BLOB: ApiMethod = ApiMethod::new( "encoded-size", false, &IntegerSchema::new("Encoded blob size.") - .minimum(std::mem::size_of::() as isize) + .minimum(std::mem::size_of::() as i64) .maximum( - 1024 * 1024 * 16 - + (std::mem::size_of::() as isize) + 1024 * 1024 * 16 + (std::mem::size_of::() as i64) ) .schema() ) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel