From: Petr Machata <me@pmachata.org>
To: netdev@vger.kernel.org, dsahern@gmail.com, stephen@networkplumber.org
Cc: Po.Liu@nxp.com, toke@toke.dk, dave.taht@gmail.com,
edumazet@google.com, tahiliani@nitk.edu.in, leon@kernel.org,
Petr Machata <me@pmachata.org>
Subject: [PATCH iproute2-next v2 5/7] lib: print_color_rate(): Fix formatting small rates in IEC mode
Date: Sat, 5 Dec 2020 22:13:33 +0100 [thread overview]
Message-ID: <01ae308a04bd16c8671cfef2d14688f00bef4846.1607201857.git.me@pmachata.org> (raw)
In-Reply-To: <cover.1607201857.git.me@pmachata.org>
ISO/IEC units are distinguished from the decadic ones by using a prefixes
like "Ki", "Mi" instead of "K" and "M". The current code inserts the letter
"i" after the decadic unit when in IEC mode. However it does so even when
the prefix is an empty string, formatting 1Kbit in IEC mode as "1000ibit".
Fix by omitting the letter if there is no prefix.
Signed-off-by: Petr Machata <me@pmachata.org>
---
lib/json_print.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/json_print.c b/lib/json_print.c
index d28e957c9603..b086123ad1f4 100644
--- a/lib/json_print.c
+++ b/lib/json_print.c
@@ -333,7 +333,8 @@ int print_color_rate(bool use_iec, enum output_type type, enum color_attr color,
rate /= kilo;
}
- rc = asprintf(&buf, "%.0f%s%sbit", (double)rate, units[i], str);
+ rc = asprintf(&buf, "%.0f%s%sbit", (double)rate, units[i],
+ i > 0 ? str : "");
if (rc < 0)
return -1;
--
2.25.1
next prev parent reply other threads:[~2020-12-05 21:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 21:13 [PATCH iproute2-next v2 0/7] Move rate and size parsing and output to lib Petr Machata
2020-12-05 21:13 ` [PATCH iproute2-next v2 1/7] Move the use_iec declaration to the tools Petr Machata
2020-12-05 21:13 ` [PATCH iproute2-next v2 2/7] lib: Move print_rate() from tc here; modernize Petr Machata
2020-12-05 21:13 ` [PATCH iproute2-next v2 3/7] lib: Move sprint_size() from tc here, add print_size() Petr Machata
2020-12-05 21:13 ` [PATCH iproute2-next v2 4/7] lib: sprint_size(): Uncrustify the code a bit Petr Machata
2020-12-05 21:13 ` Petr Machata [this message]
2020-12-05 21:13 ` [PATCH iproute2-next v2 6/7] lib: Move get_rate(), get_rate64() from tc here Petr Machata
2020-12-05 21:13 ` [PATCH iproute2-next v2 7/7] lib: Move get_size() " Petr Machata
2020-12-09 2:34 ` [PATCH iproute2-next v2 0/7] Move rate and size parsing and output to lib David Ahern
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=01ae308a04bd16c8671cfef2d14688f00bef4846.1607201857.git.me@pmachata.org \
--to=me@pmachata.org \
--cc=Po.Liu@nxp.com \
--cc=dave.taht@gmail.com \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=leon@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=tahiliani@nitk.edu.in \
--cc=toke@toke.dk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.