Merge fmt_human_2 and fmt_human_10 to one function

[slstatus.git] / util.c

diff --git a/util.c b/util.c
index a7576b4..fc8b72a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -48,6 +48,27 @@ die(const char *fmt, ...)
        exit(1);
 }
 
        exit(1);
 }
 

+int
+esnprintf(char *str, size_t size, const char *fmt, ...)
+{
+       va_list ap;
+       int ret;
+
+       va_start(ap, fmt);
+       ret = vsnprintf(str, size, fmt, ap);
+       va_end(ap);
+
+       if (ret < 0) {
+               warn("snprintf:");
+               return -1;
+       } else if ((size_t)ret >= size) {
+               warn("snprintf: Output truncated");
+               return -1;
+       }
+
+       return ret;
+}
+

 const char *
 bprintf(const char *fmt, ...)
 {
 const char *
 bprintf(const char *fmt, ...)
 {


@@ -66,19 +87,27 @@ bprintf(const char *fmt, ...)
 }
 
 const char *
 }
 
 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;
+       size_t i;
+       double scaled;
+       const char *siprefix[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
+       const char *iecprefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
+                                   "Zi", "Yi" };
+       char *prefix[9];
+
+       if (base == 1000) {
+               memcpy(prefix, siprefix, sizeof(prefix));
+       } else if (base == 1024) {
+               memcpy(prefix, iecprefix, sizeof(prefix));
+       }
+
+       scaled = num;
+       for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) {
+               scaled /= base;

        }
 
        }
 

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

 }
 
 int
 }
 
 int