Consistent paramter naming for components

[slstatus.git] / components / disk.c

diff --git a/components/disk.c b/components/disk.c
index cf3c099..15a221b 100644 (file)
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,31 +1,29 @@
 /* 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);
+       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;
        }
 
@@ -34,27 +32,27 @@ disk_perc(const char *mnt)
 }
 
 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);
+       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));
+       return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
 }