X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/d0c68989cd9f42f2b79da3a2ebe9d4765b28bfc1..3f45a5f7caf37ec04bbc3aea5e7def1452d1118c:/components/ram.c?ds=inline

diff --git a/components/ram.c b/components/ram.c
index 8f96b04..1c12aab 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -14,7 +14,7 @@
 		               "MemFree: %ld kB\n"
 		               "MemAvailable: %ld kB\n",
 		               &free, &free, &free) == 3) ?
-		       fmt_scaled(free * 1024) : NULL;
+		       fmt_human_2(free * 1024, "B") : NULL;
 	}
 
 	const char *
@@ -28,7 +28,7 @@
 		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
 		               "Cached: %ld kB\n",
 		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       bprintf("%d", 100 * ((total - free) - (buffers + cached)) /
+		       bprintf("%d%%", 100 * ((total - free) - (buffers + cached)) /
 		               total) :
 		       NULL;
 	}
@@ -39,7 +39,7 @@
 		long total;
 
 		return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
-		       fmt_scaled(total * 1024) : NULL;
+		       fmt_human_2(total * 1024, "B") : NULL;
 	}
 
 	const char *
@@ -53,7 +53,7 @@
 		               "MemAvailable: %ld kB\nBuffers: %ld kB\n"
 		               "Cached: %ld kB\n",
 		               &total, &free, &buffers, &buffers, &cached) == 5) ?
-		       fmt_scaled((total - free - buffers - cached) * 1024) : NULL;
+		       fmt_human_2((total - free - buffers - cached) * 1024, "B") : NULL;
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -83,7 +83,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			free_pages = uvmexp.npages - uvmexp.active;
-			return fmt_scaled(pagetok(free_pages, uvmexp.pageshift) * 1024);
+			return fmt_human_2(pagetok(free_pages, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;
@@ -97,7 +97,7 @@
 
 		if (load_uvmexp(&uvmexp)) {
 			percent = uvmexp.active * 100 / uvmexp.npages;
-			return bprintf("%d", percent);
+			return bprintf("%d%%", percent);
 		}
 
 		return NULL;
@@ -109,7 +109,7 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_scaled(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024);
+			return fmt_human_2(pagetok(uvmexp.npages, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;
@@ -121,7 +121,7 @@
 		struct uvmexp uvmexp;
 
 		if (load_uvmexp(&uvmexp)) {
-			return fmt_scaled(pagetok(uvmexp.active, uvmexp.pageshift) * 1024);
+			return fmt_human_2(pagetok(uvmexp.active, uvmexp.pageshift) * 1024, "B");
 		}
 
 		return NULL;