X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/4bd234c7ef7224117a6e50eda4ce3184338daab1..cf2b604507a71c61e757d7bf85458c7300eb3cf5:/components/swap.c

diff --git a/components/swap.c b/components/swap.c
index f5db667..37ee85c 100644
--- a/components/swap.c
+++ b/components/swap.c
@@ -48,7 +48,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2(free * 1024, "B");
+		return fmt_human(free * 1024, 1024);
 	}
 
 	const char *
@@ -80,7 +80,7 @@
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 * (total - free - cached) / total);
+		return bprintf("%d", 100 * (total - free - cached) / total);
 	}
 
 	const char *
@@ -98,7 +98,7 @@
 		}
 		sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-		return fmt_human_2(total * 1024, "B");
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -126,7 +126,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_human_2((total - free - cached) * 1024, "B");
+		return fmt_human((total - free - cached) * 1024, 1024);
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -135,29 +135,27 @@
 	#include <sys/types.h>
 	#include <unistd.h>
 
-	static void
+	static int
 	getstats(int *total, int *used)
 	{
 		struct swapent *sep, *fsep;
 		int rnswap, nswap, i;
 
-		nswap = swapctl(SWAP_NSWAP, 0, 0);
-		if (nswap < 1) {
+		if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) < 1) {
 			warn("swaptctl 'SWAP_NSWAP':");
+			return 1;
 		}
-
-		fsep = sep = calloc(nswap, sizeof(*sep));
-		if (!sep) {
+		if (!(fsep = sep = calloc(nswap, sizeof(*sep)))) {
 			warn("calloc 'nswap':");
+			return 1;
 		}
-
-		rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
-		if (rnswap < 0) {
+		if ((rnswap = swapctl(SWAP_STATS, (void *)sep, nswap)) < 0) {
 			warn("swapctl 'SWAP_STATA':");
+			return 1;
 		}
-
 		if (nswap != rnswap) {
 			warn("getstats: SWAP_STATS != SWAP_NSWAP");
+			return 1;
 		}
 
 		*total = 0;
@@ -169,6 +167,8 @@
 		}
 
 		free(fsep);
+
+		return 0;
 	}
 
 	const char *
@@ -176,9 +176,11 @@
 	{
 		int total, used;
 
-		getstats(&total, &used);
+		if (getstats(&total, &used)) {
+			return NULL;
+		}
 
-		return fmt_human_2((total - used) * 1024, "B");
+		return fmt_human((total - used) * 1024, 1024);
 	}
 
 	const char *
@@ -186,13 +188,15 @@
 	{
 		int total, used;
 
-		getstats(&total, &used);
+		if (getstats(&total, &used)) {
+			return NULL;
+		}
 
 		if (total == 0) {
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 * used / total);
+		return bprintf("%d", 100 * used / total);
 	}
 
 	const char *
@@ -200,9 +204,11 @@
 	{
 		int total, used;
 
-		getstats(&total, &used);
+		if (getstats(&total, &used)) {
+			return NULL;
+		}
 
-		return fmt_human_2(total * 1024, "B");
+		return fmt_human(total * 1024, 1024);
 	}
 
 	const char *
@@ -210,8 +216,10 @@
 	{
 		int total, used;
 
-		getstats(&total, &used);
+		if (getstats(&total, &used)) {
+			return NULL;
+		}
 
-		return fmt_human_2(used * 1024, "B");
+		return fmt_human(used * 1024, 1024);
 	}
 #endif