ram: Use POSIX types

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 0eb2ea9..74bf337 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,56 +4,71 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

+       #include <inttypes.h>
+

        const char *
        ram_free(void)
        {
        const char *
        ram_free(void)
        {

-               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;
+               uint64_t free;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %" PRIu64 " kB\n"
+                          "MemFree: %" PRIu64 " kB\n"
+                          "MemAvailable: %" PRIu64 " kB\n",
+                          &free, &free, &free) != 3) {
+                       return NULL;
+               }
+
+               return fmt_human(free * 1024, 1024);

        }
 
        const char *
        ram_perc(void)
        {
        }
 
        const char *
        ram_perc(void)
        {

-               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;
+               uint64_t total, free, buffers, cached;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %" PRIu64 " kB\n"
+                          "MemFree: %" PRIu64 " kB\n"
+                          "MemAvailable: %" PRIu64 " kB\nBuffers: %ld kB\n"
+                          "Cached: %" PRIu64 " kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 * ((total - free) -
+                                           (buffers + cached)) / total);

        }
 
        const char *
        ram_total(void)
        {
        }
 
        const char *
        ram_total(void)
        {

-               long total;
+               uint64_t total;

 
 

-               return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-                      fmt_scaled(total * 1024) : NULL;
+               if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
+                          &total) != 1) {
+                       return NULL;
+               }
+
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        ram_used(void)
        {
        }
 
        const char *
        ram_used(void)
        {

-               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;
+               uint64_t total, free, buffers, cached;
+
+               if (pscanf("/proc/meminfo",
+                          "MemTotal: %" PRIu64 " kB\n"
+                          "MemFree: %" PRIu64 " kB\n"
+                          "MemAvailable: %" PRIu64 " kB\nBuffers: %" PRIu64 " kB\n"
+                          "Cached: %" PRIu64 " kB\n",
+                          &total, &free, &buffers, &buffers, &cached) != 5) {
+                       return NULL;
+               }
+
+               return fmt_human((total - free - buffers - cached) * 1024,
+                                1024);

        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>


@@ -62,7 +77,7 @@
        #include <unistd.h>
 
        #define LOG1024         10
        #include <unistd.h>
 
        #define LOG1024         10

-       #define pagetok(size, pageshift) ((size) << (pageshift - LOG1024))
+       #define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))

 
        inline int
        load_uvmexp(struct uvmexp *uvmexp)
 
        inline int
        load_uvmexp(struct uvmexp *uvmexp)


@@ -72,7 +87,11 @@
 
                size = sizeof(*uvmexp);
 
 
                size = sizeof(*uvmexp);
 

-               return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
+               if (sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0) {
+                       return 1;
+               }
+
+               return 0;

        }
 
        const char *
        }
 
        const char *


@@ -83,7 +102,8 @@
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;

-                       return fmt_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
+                       return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
+                                        1024, 1024);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -97,7 +117,7 @@
 
                if (load_uvmexp(&uvmexp)) {
                        percent = uvmexp.active * 100 / uvmexp.npages;
 
                if (load_uvmexp(&uvmexp)) {
                        percent = uvmexp.active * 100 / uvmexp.npages;

-                       return bprintf("%d%%", percent);
+                       return bprintf("%d", percent);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -109,7 +129,9 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {

-                       return fmt_scaled(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024);
+                       return fmt_human(pagetok(uvmexp.npages,
+                                                uvmexp.pageshift) * 1024,
+                                        1024);

                }
 
                return NULL;
                }
 
                return NULL;


@@ -121,7 +143,9 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {

-                       return fmt_scaled(pagetok(uvmexp.active, uvmexp.pageshift) * 1024);
+                       return fmt_human(pagetok(uvmexp.active,
+                                                uvmexp.pageshift) * 1024,
+                                        1024);

                }
 
                return NULL;
                }
 
                return NULL;