X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/46c4540dd2f6181e77b0800a4e007d78d0162487..efa26f4f3548bce8086abcd8de7ca135169e6f37:/components/ram.c

diff --git a/components/ram.c b/components/ram.c
index 1c12aab..0333b3b 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -9,12 +9,15 @@
 	{
 		long free;
 
-		return (pscanf("/proc/meminfo",
-		               "MemTotal: %ld kB\n"
-		               "MemFree: %ld kB\n"
-		               "MemAvailable: %ld kB\n",
-		               &free, &free, &free) == 3) ?
-		       fmt_human_2(free * 1024, "B") : NULL;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\n",
+		           &free, &free, &free) != 3) {
+			return NULL;
+		}
+
+		return fmt_human(free * 1024, 1024);
 	}
 
 	const char *
@@ -22,15 +25,17 @@
 	{
 		long total, free, buffers, cached;
 
-		return (pscanf("/proc/meminfo",
-		               "MemTotal: %ld kB\n"
-		               "MemFree: %ld kB\n"
-		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-		               "Cached: %ld kB\n",
-		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) /
-		               total) :
-		       NULL;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+		           "Cached: %ld kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return bprintf("%d", 100 * ((total - free) -
+		                            (buffers + cached)) / total);
 	}
 
 	const char *
@@ -38,8 +43,12 @@
 	{
 		long total;
 
-		return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-		       fmt_human_2(total * 1024, "B") : NULL;
+		if (pscanf("/proc/meminfo", "MemTotal: %ld kB\n",
+		           &total) != 1) {
+			return NULL;
+		}
+
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -47,13 +56,17 @@
 	{
 		long total, free, buffers, cached;
 
-		return (pscanf("/proc/meminfo",
-		               "MemTotal: %ld kB\n"
-		               "MemFree: %ld kB\n"
-		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
-		               "Cached: %ld kB\n",
-		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       fmt_human_2((total - free - buffers - cached) * 1024, "B") : NULL;
+		if (pscanf("/proc/meminfo",
+		           "MemTotal: %ld kB\n"
+		           "MemFree: %ld kB\n"
+		           "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+		           "Cached: %ld kB\n",
+		           &total, &free, &buffers, &buffers, &cached) != 5) {
+			return NULL;
+		}
+
+		return fmt_human((total - free - buffers - cached) * 1024,
+		                 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -62,7 +75,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)
@@ -72,7 +85,11 @@
 
 		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 *
@@ -83,7 +100,8 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			free_pages = uvmexp.npages - uvmexp.active;
-			return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
+			return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
+			                 1024, 1024);
 		}
 
 		return NULL;
@@ -97,7 +115,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d%%", percent);
+			return bprintf("%d", percent);
 		}
 
 		return NULL;
@@ -109,7 +127,9 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
+			return fmt_human(pagetok(uvmexp.npages,
+			                         uvmexp.pageshift) * 1024,
+			                 1024);
 		}
 
 		return NULL;
@@ -121,7 +141,9 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
+			return fmt_human(pagetok(uvmexp.active,
+			                         uvmexp.pageshift) * 1024,
+			                 1024);
 		}
 
 		return NULL;