X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/43a12832a343747b7317987b552a87eb8ed5b42d..ec306623df7321a4e6ec11f70b6152a2e614d1ed:/components/ram.c

diff --git a/components/ram.c b/components/ram.c
index a2fff95..48144e4 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -4,7 +4,7 @@
 #include "../util.h"
 
 #if defined(__linux__)
-	#include <inttypes.h>
+	#include <stdint.h>
 
 	const char *
 	ram_free(void)
@@ -12,9 +12,9 @@
 		uintmax_t free;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %" PRIuMAX " kB\n"
-		           "MemFree: %" PRIuMAX " kB\n"
-		           "MemAvailable: %" PRIuMAX " kB\n",
+		           "MemTotal: %ju kB\n"
+		           "MemFree: %ju kB\n"
+		           "MemAvailable: %ju kB\n",
 		           &free, &free, &free) != 3) {
 			return NULL;
 		}
@@ -28,10 +28,11 @@
 		uintmax_t total, free, buffers, cached;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %" PRIuMAX " kB\n"
-		           "MemFree: %" PRIuMAX " kB\n"
-		           "MemAvailable: %" PRIuMAX " kB\nBuffers: %ld kB\n"
-		           "Cached: %" PRIuMAX " 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,8 +41,8 @@
 			return NULL;
 		}
 
-		return bprintf("%d", 100 * ((total - free) -
-		                            (buffers + cached)) / total);
+		return bprintf("%d", 100 * ((total - free) - (buffers + cached))
+                               / total);
 	}
 
 	const char *
@@ -49,8 +50,8 @@
 	{
 		uintmax_t total;
 
-		if (pscanf("/proc/meminfo", "MemTotal: %" PRIuMAX " kB\n",
-		           &total) != 1) {
+		if (pscanf("/proc/meminfo", "MemTotal: %ju kB\n", &total)
+		    != 1) {
 			return NULL;
 		}
 
@@ -63,10 +64,11 @@
 		uintmax_t total, free, buffers, cached;
 
 		if (pscanf("/proc/meminfo",
-		           "MemTotal: %" PRIuMAX " kB\n"
-		           "MemFree: %" PRIuMAX " kB\n"
-		           "MemAvailable: %" PRIuMAX " kB\nBuffers: %" PRIuMAX " kB\n"
-		           "Cached: %" PRIuMAX " 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