cpu_freq: Change to 64 bit integers

[slstatus.git] / components / ram.c

diff --git a/components/ram.c b/components/ram.c
index 0ac9753..a2fff95 100644 (file)
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,15 +4,17 @@
 #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;
+               uintmax_t free;

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

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

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


@@ -23,17 +25,21 @@
        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: %" PRIuMAX " kB\n"
+                          "MemFree: %" PRIuMAX " kB\n"
+                          "MemAvailable: %" PRIuMAX " kB\nBuffers: %ld kB\n"
+                          "Cached: %" PRIuMAX " kB\n",

                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
 
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
 

+               if (total == 0) {
+                       return NULL;
+               }
+

                return bprintf("%d", 100 * ((total - free) -
                                            (buffers + cached)) / total);
        }
                return bprintf("%d", 100 * ((total - free) -
                                            (buffers + cached)) / total);
        }


@@ -41,9 +47,9 @@
        const char *
        ram_total(void)
        {
        const char *
        ram_total(void)
        {

-               long total;
+               uintmax_t total;

 
 

-               if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
+               if (pscanf("/proc/meminfo", "MemTotal: %" PRIuMAX " kB\n",

                           &total) != 1) {
                        return NULL;
                }
                           &total) != 1) {
                        return NULL;
                }


@@ -54,13 +60,13 @@
        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: %" PRIuMAX " kB\n"
+                          "MemFree: %" PRIuMAX " kB\n"
+                          "MemAvailable: %" PRIuMAX " kB\nBuffers: %" PRIuMAX " kB\n"
+                          "Cached: %" PRIuMAX " kB\n",

                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }
                           &total, &free, &buffers, &buffers, &cached) != 5) {
                        return NULL;
                }


@@ -75,7 +81,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)