From: Petr Machata Date: Sat, 5 Dec 2020 21:13:33 +0000 (+0100) Subject: lib: print_color_rate(): Fix formatting small rates in IEC mode X-Git-Tag: v5.11.0~32^2~5^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaeda2a7687c8223b23aeb154beda6ac8c09b75f;p=thirdparty%2Fiproute2.git lib: print_color_rate(): Fix formatting small rates in IEC mode 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 Signed-off-by: David Ahern --- diff --git a/lib/json_print.c b/lib/json_print.c index d28e957c9..b086123ad 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;