Add keymap to README

[slstatus.git] / util.c

diff --git a/util.c b/util.c
index 6dd08d7..b412211 100644 (file)
--- a/util.c
+++ b/util.c
@@ -87,32 +87,32 @@ bprintf(const char *fmt, ...)
 }
 
 const char *
 }
 
 const char *

-fmt_human_2(size_t num)
+fmt_human(size_t num, int base)

 {
 {

-       size_t i;

        double scaled;
        double scaled;

-       const char *prefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
-                                "Zi", "Yi" };
-
-       scaled = num;
-       for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) {
-               scaled /= 1024.0;
+       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, prefix[i]);
-}
-
-const char *
-fmt_human_10(size_t num)
-{
-       size_t i;
-       double scaled;
-       const char *prefix[] = { "", "K", "M", "G", "T", "P", "E",
-                                "Z", "Y" };
-

        scaled = num;
        scaled = num;

-       for (i = 0; i < LEN(prefix) && scaled >= 1000; i++) {
-               scaled /= 1000.0;
+       for (i = 0; i < prefixlen && scaled >= base; i++) {
+               scaled /= base;

        }
 
        return bprintf("%.1f%s", scaled, prefix[i]);
        }
 
        return bprintf("%.1f%s", scaled, prefix[i]);