Add native OpenBSD support for mute/volume

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index f653156..48144e4 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,68 +4,77 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

+       #include <stdint.h>
+

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

-               long free;
+               uintmax_t free;

 
                if (pscanf("/proc/meminfo",
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %ld kB\n"
-                          "MemFree: %ld kB\n"
-                          "MemAvailable: %ld kB\n",
+                          "MemTotal: %ju kB\n"
+                          "MemFree: %ju kB\n"
+                          "MemAvailable: %ju kB\n",

                           &free, &free, &free) != 3) {
                        return NULL;
                }
 
                           &free, &free, &free) != 3) {
                        return NULL;
                }
 

-               return fmt_human_2(free * 1024);
+               return fmt_human(free * 1024, 1024);

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

-               long total, free, buffers, cached;
+               uintmax_t total, free, buffers, cached;

 
                if (pscanf("/proc/meminfo",
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %ld kB\n"
-                          "MemFree: %ld kB\n"
-                          "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                          "Cached: %ld 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;
                }
 
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
 

-               return bprintf("%d", 100 * ((total - free) -
-                                           (buffers + cached)) / total);
+               if (total == 0) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 * ((total - free) - (buffers + cached))
+                               / total);

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

-               long total;
+               uintmax_t total;

 
 

-               if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
-                          &total) != 1) {
+               if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
+                   != 1) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_human_2(total * 1024);
+               return fmt_human(total * 1024, 1024);

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

-               long total, free, buffers, cached;
+               uintmax_t total, free, buffers, cached;

 
                if (pscanf("/proc/meminfo",
 
                if (pscanf("/proc/meminfo",

-                          "MemTotal: %ld kB\n"
-                          "MemFree: %ld kB\n"
-                          "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-                          "Cached: %ld 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;
                }
 
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
 

-               return fmt_human_2((total - free - buffers - cached) * 1024);
+               return fmt_human((total - free - buffers - cached) * 1024,
+                                1024);

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


@@ -73,8 +82,8 @@
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/types.h>
        #include <unistd.h>
 

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

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


@@ -84,7 +93,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 *


@@ -95,8 +108,8 @@
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;
 
                if (load_uvmexp(&uvmexp)) {
                        free_pages = uvmexp.npages - uvmexp.active;

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

                }
 
                return NULL;
                }
 
                return NULL;


@@ -122,8 +135,9 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {

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

                }
 
                return NULL;
                }
 
                return NULL;


@@ -135,8 +149,9 @@
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {
                struct uvmexp uvmexp;
 
                if (load_uvmexp(&uvmexp)) {

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

                }
 
                return NULL;
                }
 
                return NULL;