X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/bae576cd221ef8f30195d6927cf935a797ac5a02..ab4f24a612fd40bb58b5504e979ad476533dd891:/components/ram.c

diff --git a/components/ram.c b/components/ram.c
index cba22a1..8688349 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,36 +4,42 @@
 #include "../util.h"
 
 #if defined(__linux__)
+	#include <inttypes.h>
+
 	const char *
 	ram_free(void)
 	{
-		long free;
+		uint64_t free;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ld kB\n"
-		           "MemFree: %ld kB\n"
-		           "MemAvailable: %ld kB\n",
+		           "MemTotal: %" PRIu64 " kB\n"
+		           "MemFree: %" PRIu64 " kB\n"
+		           "MemAvailable: %" PRIu64 " kB\n",
 		           &free, &free, &free) != 3) {
 			return NULL;
 		}
 
-		return fmt_human_2(free * 1024);
+		return fmt_human(free * 1024, 1024);
 	}
 
 	const char *
 	ram_perc(void)
 	{
-		long total, free, buffers, cached;
+		uint64_t total, free, buffers, cached;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ld kB\n"
-		           "MemFree: %ld kB\n"
-		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-		           "Cached: %ld kB\n",
+		           "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;
 		}
 
+		if (total == 0) {
+			return NULL;
+		}
+
 		return bprintf("%d", 100 * ((total - free) -
 		                            (buffers + cached)) / total);
 	}
@@ -41,31 +47,32 @@
 	const char *
 	ram_total(void)
 	{
-		long total;
+		uint64_t total;
 
-		if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
+		if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
 		           &total) != 1) {
 			return NULL;
 		}
 
-		return fmt_human_2(total * 1024);
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
 	ram_used(void)
 	{
-		long total, free, buffers, cached;
+		uint64_t total, free, buffers, cached;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %ld kB\n"
-		           "MemFree: %ld kB\n"
-		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-		           "Cached: %ld kB\n",
+		           "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_2((total - free - buffers - cached) * 1024);
+		return fmt_human((total - free - buffers - cached) * 1024,
+		                 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -74,7 +81,7 @@
 	#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)
@@ -99,8 +106,8 @@
 
 		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;
@@ -126,8 +133,9 @@
 		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;
@@ -139,8 +147,9 @@
 		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;