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

diff --git a/components/swap.c b/components/swap.c
index 73d24df..f5db667 100644
--- a/components/swap.c
+++ b/components/swap.c
@@ -48,7 +48,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_scaled(free * 1024);
+		return fmt_human_2(free * 1024, "B");
 	}
 
 	const char *
@@ -76,7 +76,11 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return bprintf("%d", 100 * (total - free - cached) / total);
+		if (total == 0) {
+			return NULL;
+		}
+
+		return bprintf("%d%%", 100 * (total - free - cached) / total);
 	}
 
 	const char *
@@ -94,7 +98,7 @@
 		}
 		sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-		return fmt_scaled(total * 1024);
+		return fmt_human_2(total * 1024, "B");
 	}
 
 	const char *
@@ -122,7 +126,7 @@
 		}
 		sscanf(match, "SwapFree: %ld kB\n", &free);
 
-		return fmt_scaled((total - free - cached) * 1024);
+		return fmt_human_2((total - free - cached) * 1024, "B");
 	}
 #elif defined(__OpenBSD__)
 	#include <stdlib.h>
@@ -174,7 +178,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_scaled((total - used) * 1024);
+		return fmt_human_2((total - used) * 1024, "B");
 	}
 
 	const char *
@@ -184,7 +188,11 @@
 
 		getstats(&total, &used);
 
-		return bprintf("%d", 100 * used / total);
+		if (total == 0) {
+			return NULL;
+		}
+
+		return bprintf("%d%%", 100 * used / total);
 	}
 
 	const char *
@@ -194,7 +202,7 @@
 
 		getstats(&total, &used);
 
-		return fmt_scaled(total * 1024);
+		return fmt_human_2(total * 1024, "B");
 	}
 
 	const char *
@@ -204,6 +212,6 @@
 
 		getstats(&total, &used);
 
-		return fmt_scaled(used * 1024);
+		return fmt_human_2(used * 1024, "B");
 	}
 #endif