Xinqi Bao's Git

Check printf() for output errors
[slstatus.git] / util.c
diff --git a/util.c b/util.c
index 923d4df..b412211 100644 (file)
--- a/util.c
+++ b/util.c
@@ -87,19 +87,35 @@ bprintf(const char *fmt, ...)
 }
 
 const char *
-fmt_scaled(size_t bytes)
+fmt_human(size_t num, int base)
 {
-       unsigned int i;
-       float scaled;
-       const char *units[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB",
-                               "ZiB", "YiB" };
-
-       scaled = bytes;
-       for (i = 0; i < LEN(units) && scaled >= 1024; i++) {
-               scaled /= 1024.0;
+       double scaled;
+       size_t i, prefixlen;
+       const char **prefix;
+       const char *prefix_1000[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
+       const char *prefix_1024[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
+                                     "Zi", "Yi" };
+
+       switch (base) {
+       case 1000:
+               prefix = prefix_1000;
+               prefixlen = LEN(prefix_1000);
+               break;
+       case 1024:
+               prefix = prefix_1024;
+               prefixlen = LEN(prefix_1024);
+               break;
+       default:
+               warn("fmt_human: Invalid base");
+               return NULL;
        }
 
-       return bprintf("%.1f%s", scaled, units[i]);
+       scaled = num;
+       for (i = 0; i < prefixlen && scaled >= base; i++) {
+               scaled /= base;
+       }
+
+       return bprintf("%.1f%s", scaled, prefix[i]);
 }
 
 int