From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Maximiliano Sandoval <m.sandoval@proxmox.com>
Subject: Re: [pbs-devel] [PATCH v2 pbs] fix #4638: proxmox-backup-client: status: guard against div by zero
Date: Wed, 7 Jun 2023 13:13:57 +0200 [thread overview]
Message-ID: <df259a22-57c5-195e-687d-603d62a58e5d@proxmox.com> (raw)
In-Reply-To: <20230607085513.24501-1-m.sandoval@proxmox.com>
Am 07/06/2023 um 10:55 schrieb Maximiliano Sandoval:
> We throw an error if the value for total is zero.
>
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
> Previous patch contained a wrong email.
>
> proxmox-backup-client/src/main.rs | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
> index 55198108..5a804d95 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -1590,9 +1590,12 @@ async fn status(param: Value) -> Result<Value, Error> {
> let v = v.as_u64().unwrap();
> let total = record["total"].as_u64().unwrap();
> let roundup = total / 200;
> - let per = ((v + roundup) * 100) / total;
> - let info = format!(" ({} %)", per);
> - Ok(format!("{} {:>8}", v, info))
> + if let Some(per) = ((v + roundup) * 100).checked_div(total) {
> + let info = format!(" ({} %)", per);
FYI: When touching existing format lines, please feel encouraged to switch over
to using template variables wherever possible:
let info = format!(" ({per} %)");
Ok(format!("{v} {info:>8}"))
> + Ok(format!("{} {:>8}", v, info))
> + } else {
> + bail!("Cannot render total percentage: denominator is zero");
> + }
> };
>
> let options = default_table_format_options()
prev parent reply other threads:[~2023-06-07 11:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 8:55 Maximiliano Sandoval
2023-06-07 9:23 ` [pbs-devel] applied " Dietmar Maurer
2023-06-07 11:13 ` Thomas Lamprecht [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=df259a22-57c5-195e-687d-603d62a58e5d@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=m.sandoval@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox