Xinqi Bao's Git

Remove initialization to 0 for static vars
[slstatus.git] / components / ram.c
index f451601..1c12aab 100644 (file)
@@ -14,7 +14,7 @@
                               "MemFree: %ld kB\n"
                               "MemAvailable: %ld kB\n",
                               &free, &free, &free) == 3) ?
-                      bprintf("%f", (float)free / 1024 / 1024) : NULL;
+                      fmt_human_2(free * 1024, "B") : NULL;
        }
 
        const char *
@@ -28,7 +28,7 @@
                               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
                               "Cached: %ld kB\n",
                               &total, &free, &buffers, &buffers, &cached) == 5) ?
-                      bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
+                      bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) /
                               total) :
                       NULL;
        }
@@ -39,7 +39,7 @@
                long total;
 
                return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-                      bprintf("%f", (float)total / 1024 / 1024) : NULL;
+                      fmt_human_2(total * 1024, "B") : NULL;
        }
 
        const char *
@@ -53,9 +53,7 @@
                               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
                               "Cached: %ld kB\n",
                               &total, &free, &buffers, &buffers, &cached) == 5) ?
-                      bprintf("%f", (float)(total - free - buffers - cached) /
-                              1024 / 1024) :
-                      NULL;
+                      fmt_human_2((total - free - buffers - cached) * 1024, "B") : NULL;
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
        ram_free(void)
        {
                struct uvmexp uvmexp;
-               float free;
                int free_pages;
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;
-                       free = (float)(pagetok(free_pages, uvmexp.pageshift)) / 1024 / 1024;
-                       return bprintf("%f", free);
+                       return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;
 
                if (load_uvmexp(&uvmexp)) {
                        percent = uvmexp.active * 100 / uvmexp.npages;
-                       return bprintf("%d", percent);
+                       return bprintf("%d%%", percent);
                }
 
                return NULL;
        ram_total(void)
        {
                struct uvmexp uvmexp;
-               float total;
 
                if (load_uvmexp(&uvmexp)) {
-                       total = (float)(pagetok(uvmexp.npages, uvmexp.pageshift)) / 1024 / 1024;
-                       return bprintf("%f", total);
+                       return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;
        ram_used(void)
        {
                struct uvmexp uvmexp;
-               float used;
 
                if (load_uvmexp(&uvmexp)) {
-                       used = (float)(pagetok(uvmexp.active, uvmexp.pageshift)) / 1024 / 1024;
-                       return bprintf("%f", used);
+                       return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
                }
 
                return NULL;