X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ec5c35ec9f23254f09e734d0c1880559774dfa52..b0401b13bb78bacde9d10b00766830cbeb2c90f6:/util.c

diff --git a/util.c b/util.c
index 6dd08d7..5ce2396 100644
--- a/util.c
+++ b/util.c
@@ -48,71 +48,77 @@ die(const char *fmt, ...)
 	exit(1);
 }
 
-int
-esnprintf(char *str, size_t size, const char *fmt, ...)
+static int
+evsnprintf(char *str, size_t size, const char *fmt, va_list ap)
 {
-	va_list ap;
 	int ret;
 
-	va_start(ap, fmt);
 	ret = vsnprintf(str, size, fmt, ap);
-	va_end(ap);
 
 	if (ret < 0) {
-		warn("snprintf:");
+		warn("vsnprintf:");
 		return -1;
 	} else if ((size_t)ret >= size) {
-		warn("snprintf: Output truncated");
+		warn("vsnprintf: Output truncated");
 		return -1;
 	}
 
 	return ret;
 }
 
-const char *
-bprintf(const char *fmt, ...)
+int
+esnprintf(char *str, size_t size, const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
 
 	va_start(ap, fmt);
-	if ((ret = vsnprintf(buf, sizeof(buf), fmt, ap)) < 0) {
-		warn("vsnprintf:");
-	} else if ((size_t)ret >= sizeof(buf)) {
-		warn("vsnprintf: Output truncated");
-	}
+	ret = evsnprintf(str, size, fmt, ap);
 	va_end(ap);
 
-	return buf;
+	return ret;
 }
 
 const char *
-fmt_human_2(size_t num)
+bprintf(const char *fmt, ...)
 {
-	size_t i;
-	double scaled;
-	const char *prefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
-	                         "Zi", "Yi" };
+	va_list ap;
+	int ret;
 
-	scaled = num;
-	for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) {
-		scaled /= 1024.0;
-	}
+	va_start(ap, fmt);
+	ret = evsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
 
-	return bprintf("%.1f%s", scaled, prefix[i]);
+	return (ret < 0) ? NULL : buf;
 }
 
 const char *
-fmt_human_10(size_t num)
+fmt_human(size_t num, int base)
 {
-	size_t i;
 	double scaled;
-	const char *prefix[] = { "", "K", "M", "G", "T", "P", "E",
-	                         "Z", "Y" };
+	size_t i, prefixlen;
+	const char **prefix;
+	const char *prefix_1000[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
+	const char *prefix_1024[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
+	                              "Zi", "Yi" };
+
+	switch (base) {
+	case 1000:
+		prefix = prefix_1000;
+		prefixlen = LEN(prefix_1000);
+		break;
+	case 1024:
+		prefix = prefix_1024;
+		prefixlen = LEN(prefix_1024);
+		break;
+	default:
+		warn("fmt_human: Invalid base");
+		return NULL;
+	}
 
 	scaled = num;
-	for (i = 0; i < LEN(prefix) && scaled >= 1000; i++) {
-		scaled /= 1000.0;
+	for (i = 0; i < prefixlen && scaled >= base; i++) {
+		scaled /= base;
 	}
 
 	return bprintf("%.1f%s", scaled, prefix[i]);