X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/bae576cd221ef8f30195d6927cf935a797ac5a02..51ff7ce2b99147a1a77ed243093865fc884e571a:/components/ram.c?ds=sidebyside

diff --git a/components/ram.c b/components/ram.c
index cba22a1..0333b3b 100644
--- a/components/ram.c
+++ b/components/ram.c
@@ -17,7 +17,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2(free * 1024);
+		return fmt_human(free * 1024, 1024);
 	}
 
 	const char *
@@ -48,7 +48,7 @@
 			return NULL;
 		}
 
-		return fmt_human_2(total * 1024);
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -65,7 +65,8 @@
 			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 +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)
@@ -99,8 +100,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 +127,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 +141,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;