X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/46c4540dd2f6181e77b0800a4e007d78d0162487..a1ac203d16c379d7fc05765545af2977a7a3584d:/components/disk.c

diff --git a/components/disk.c b/components/disk.c
index 998ad47..15a221b 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,60 +1,58 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
 
 const char *
-disk_free(const char *mnt)
+disk_free(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		warn("statvfs '%s':", mnt);
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * fs.f_bavail, "B");
+	return fmt_human(fs.f_frsize * fs.f_bavail, 1024);
 }
 
 const char *
-disk_perc(const char *mnt)
+disk_perc(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		warn("statvfs '%s':", mnt);
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return bprintf("%d%%", (int)(100 *
+	return bprintf("%d", (int)(100 *
 	               (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
 }
 
 const char *
-disk_total(const char *mnt)
+disk_total(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		warn("statvfs '%s':", mnt);
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * fs.f_blocks, "B");
+	return fmt_human(fs.f_frsize * fs.f_blocks, 1024);
 }
 
 const char *
-disk_used(const char *mnt)
+disk_used(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		warn("statvfs '%s':", mnt);
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return fmt_human_2(fs.f_frsize * (fs.f_blocks - fs.f_bfree), "B");
+	return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
 }