From 46c4540dd2f6181e77b0800a4e007d78d0162487 Mon Sep 17 00:00:00 2001 From: Laslo Hunhold Date: Sat, 19 May 2018 22:52:17 +0200 Subject: Implement fmt_human_2() and fmt_human_10() These functions take the raw number and a unit and automatically print it out "scaled down" to a proper SI-prefix, for powers of 2 and 10 respectively. Apply them to the 2-power cases and keep the 10-power for a later commit. --- util.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 923d4df..5936a6d 100644 --- a/util.c +++ b/util.c @@ -87,19 +87,35 @@ bprintf(const char *fmt, ...) } const char * -fmt_scaled(size_t bytes) +fmt_human_2(size_t num, char *unit) { - unsigned int i; - float scaled; - const char *units[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", - "ZiB", "YiB" }; + size_t i; + double scaled; + const char *prefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", + "Zi", "Yi" }; - scaled = bytes; - for (i = 0; i < LEN(units) && scaled >= 1024; i++) { + scaled = num; + for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) { scaled /= 1024.0; } - return bprintf("%.1f%s", scaled, units[i]); + return bprintf("%.1f%s%s", scaled, prefix[i], unit); +} + +const char * +fmt_human_10(size_t num, char *unit) +{ + size_t i; + double scaled; + const char *prefix[] = { "", "K", "M", "G", "T", "P", "E", + "Z", "Y" }; + + scaled = num; + for (i = 0; i < LEN(prefix) && scaled >= 1000; i++) { + scaled /= 1000.0; + } + + return bprintf("%.1f%s%s", scaled, prefix[i], unit); } int -- cgit v1.2.3