Add native OpenBSD support for mute/volume

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 8688349..48144e4 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,17 +4,17 @@
 #include "../util.h"
 
 #if defined(__linux__)
-       #include <inttypes.h>
+       #include <stdint.h>
 
        const char *
        ram_free(void)
        {
-               uint64_t free;
+               uintmax_t free;
 
                if (pscanf("/proc/meminfo",
-                          "MemTotal: %" PRIu64 " kB\n"
-                          "MemFree: %" PRIu64 " kB\n"
-                          "MemAvailable: %" PRIu64 " kB\n",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n",
                           &free, &free, &free) != 3) {
                        return NULL;
                }
@@ -25,13 +25,14 @@
        const char *
        ram_perc(void)
        {
-               uint64_t total, free, buffers, cached;
+               uintmax_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",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n"
+                          "Buffers: %ju kB\n"
+                          "Cached: %ju kB\n",
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
@@ -40,17 +41,17 @@
                        return NULL;
                }
 
-               return bprintf("%d", 100 * ((total - free) -
-                                           (buffers + cached)) / total);
+               return bprintf("%d", 100 * ((total - free) - (buffers + cached))
+                               / total);
        }
 
        const char *
        ram_total(void)
        {
-               uint64_t total;
+               uintmax_t total;
 
-               if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
-                          &total) != 1) {
+               if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
+                   != 1) {
                        return NULL;
                }
 
@@ -60,13 +61,14 @@
        const char *
        ram_used(void)
        {
-               uint64_t total, free, buffers, cached;
+               uintmax_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",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n"
+                          "Buffers: %ju kB\n"
+                          "Cached: %ju kB\n",
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
@@ -80,7 +82,7 @@
        #include <sys/types.h>
        #include <unistd.h>
 
-       #define LOG1024         10
+       #define LOG1024 10
        #define pagetok(size, pageshift) (size_t)(size << (pageshift - LOG1024))
 
        inline int