[pdm-devel] applied: [PATCH proxmox-backup v4 1/1] api: change integer schema parameters to i64

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

applied, thanks

On Thu, Sep 04, 2025 at 10:18:28AM +0200, Stefan Hanreich wrote:
> 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 <s.hanreich@proxmox.com>
> ---
>  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 d70c61e9..77b61314 100644
> --- a/pbs-tape/src/bin/pmt.rs
> +++ b/pbs-tape/src/bin/pmt.rs
> @@ -28,17 +28,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 3f6c5adb..7dc2c486 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -726,7 +726,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 cccbb331..cba5646b 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<Vec<String>>,
> -    entries_max: isize,
> +    entries_max: i64,
>      payload_output: Option<String>,
>  ) -> Result<(), Error> {
>      let patterns = {
> diff --git a/src/api2/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs
> index f8b7ecbd..8dd7e4d5 100644
> --- a/src/api2/backup/upload_chunk.rs
> +++ b/src/api2/backup/upload_chunk.rs
> @@ -134,10 +134,9 @@ pub const API_METHOD_UPLOAD_FIXED_CHUNK: ApiMethod = ApiMethod::new(
>                  "encoded-size",
>                  false,
>                  &IntegerSchema::new("Encoded chunk size.")
> -                    .minimum((std::mem::size_of::<DataBlobHeader>() as isize) + 1)
> +                    .minimum((std::mem::size_of::<DataBlobHeader>() as i64) + 1)
>                      .maximum(
> -                        1024 * 1024 * 16
> -                            + (std::mem::size_of::<EncryptedDataBlobHeader>() as isize)
> +                        1024 * 1024 * 16 + (std::mem::size_of::<EncryptedDataBlobHeader>() as i64)
>                      )
>                      .schema()
>              ),
> @@ -197,10 +196,9 @@ pub const API_METHOD_UPLOAD_DYNAMIC_CHUNK: ApiMethod = ApiMethod::new(
>                  "encoded-size",
>                  false,
>                  &IntegerSchema::new("Encoded chunk size.")
> -                    .minimum((std::mem::size_of::<DataBlobHeader>() as isize) + 1)
> +                    .minimum((std::mem::size_of::<DataBlobHeader>() as i64) + 1)
>                      .maximum(
> -                        1024 * 1024 * 16
> -                            + (std::mem::size_of::<EncryptedDataBlobHeader>() as isize)
> +                        1024 * 1024 * 16 + (std::mem::size_of::<EncryptedDataBlobHeader>() as i64)
>                      )
>                      .schema()
>              ),
> @@ -357,10 +355,9 @@ pub const API_METHOD_UPLOAD_BLOB: ApiMethod = ApiMethod::new(
>                  "encoded-size",
>                  false,
>                  &IntegerSchema::new("Encoded blob size.")
> -                    .minimum(std::mem::size_of::<DataBlobHeader>() as isize)
> +                    .minimum(std::mem::size_of::<DataBlobHeader>() as i64)
>                      .maximum(
> -                        1024 * 1024 * 16
> -                            + (std::mem::size_of::<EncryptedDataBlobHeader>() as isize)
> +                        1024 * 1024 * 16 + (std::mem::size_of::<EncryptedDataBlobHeader>() as i64)
>                      )
>                      .schema()
>              )
> -- 
> 2.47.2


_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel