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

diff --git a/components/ram.c b/components/ram.c
index 74bf337..d2fbce9 100644
--- 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,17 +25,21 @@
 	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\nBuffers: %ju kB\n"
+		           "Cached: %ju kB\n",
 		           &total, &free, &buffers, &buffers, &cached) != 5) {
 			return NULL;
 		}
 
+		if (total == 0) {
+			return NULL;
+		}
+
 		return bprintf("%d", 100 * ((total - free) -
 		                            (buffers + cached)) / total);
 	}
@@ -43,9 +47,9 @@
 	const char *
 	ram_total(void)
 	{
-		uint64_t total;
+		uintmax_t total;
 
-		if (pscanf("/proc/meminfo", "MemTotal: %" PRIu64 " kB\n",
+		if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n",
 		           &total) != 1) {
 			return NULL;
 		}
@@ -56,13 +60,13 @@
 	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\nBuffers: %ju kB\n"
+		           "Cached: %ju kB\n",
 		           &total, &free, &buffers, &buffers, &cached) != 5) {
 			return NULL;
 		}