Refactor ram.c

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 8f96b04..7c0870c 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -9,12 +9,15 @@
        {
                long free;
 
-               return (pscanf("/proc/meminfo",
-                              "MemTotal: %ld kB\n"
-                              "MemFree: %ld kB\n"
-                              "MemAvailable: %ld kB\n",
-                              &free, &free, &free) == 3) ?
-                      fmt_scaled(free * 1024) : NULL;
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ld kB\n"
+                          "MemFree: %ld kB\n"
+                          "MemAvailable: %ld kB\n",
+                          &free, &free, &free) != 3) {
+                       return NULL;
+               }
+
+               return fmt_human_2(free * 1024, "B");
        }
 
        const char *
@@ -22,15 +25,17 @@
        {
                long total, free, buffers, cached;
 
-               return (pscanf("/proc/meminfo",
-                              "MemTotal: %ld kB\n"
-                              "MemFree: %ld kB\n"
-                              "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                              "Cached: %ld kB\n",
-                              &total, &free, &buffers, &buffers, &cached) == 5) ?
-                      bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
-                              total) :
-                      NULL;
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ld kB\n"
+                          "MemFree: %ld kB\n"
+                          "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+                          "Cached: %ld kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               return bprintf("%d%%", 100 * ((total - free) -
+                                             (buffers + cached)) / total);
        }
 
        const char *
@@ -38,8 +43,12 @@
        {
                long total;
 
-               return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-                      fmt_scaled(total * 1024) : NULL;
+               if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
+                          &total) != 1) {
+                       return NULL;
+               }
+
+               return fmt_human_2(total * 1024, "B");
        }
 
        const char *
@@ -47,13 +56,17 @@
        {
                long total, free, buffers, cached;
 
-               return (pscanf("/proc/meminfo",
-                              "MemTotal: %ld kB\n"
-                              "MemFree: %ld kB\n"
-                              "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                              "Cached: %ld kB\n",
-                              &total, &free, &buffers, &buffers, &cached) == 5) ?
-                      fmt_scaled((total - free - buffers - cached) * 1024) : NULL;
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %ld kB\n"
+                          "MemFree: %ld kB\n"
+                          "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+                          "Cached: %ld kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               return fmt_human_2((total - free - buffers - cached) * 1024,
+                                  "B");
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
@@ -83,7 +96,7 @@
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;
-                       return fmt_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
+                       return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;
@@ -97,7 +110,7 @@
 
                if (load_uvmexp(&uvmexp)) {
                        percent = uvmexp.active * 100 / uvmexp.npages;
-                       return bprintf("%d", percent);
+                       return bprintf("%d%%", percent);
                }
 
                return NULL;
@@ -109,7 +122,7 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
-                       return fmt_scaled(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024);
+                       return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;
@@ -121,7 +134,7 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
-                       return fmt_scaled(pagetok(uvmexp.active, uvmexp.pageshift) * 1024);
+                       return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;