Consistent paramter naming for components

[slstatus.git] / components / disk.c

diff --git a/components/disk.c b/components/disk.c
index 90a8e0b..15a221b 100644 (file)
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,61 +1,58 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include <err.h>

 #include <stdio.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
 
 const char *
 #include <stdio.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
 
 const char *

-disk_free(const char *mnt)
+disk_free(const char *path)

 {
        struct statvfs fs;
 
 {
        struct statvfs fs;
 

-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
+       if (statvfs(path, &fs) < 0) {
+               warn("statvfs '%s':", path);

                return NULL;
        }
 
                return NULL;
        }
 

-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+       return fmt_human(fs.f_frsize * fs.f_bavail, 1024);

 }
 
 const char *
 }
 
 const char *

-disk_perc(const char *mnt)
+disk_perc(const char *path)

 {
 {

-       int perc;

        struct statvfs fs;
 
        struct statvfs fs;
 

-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
+       if (statvfs(path, &fs) < 0) {
+               warn("statvfs '%s':", path);

                return NULL;
        }
 
                return NULL;
        }
 

-       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
-
-       return bprintf("%d", perc);
+       return bprintf("%d", (int)(100 *
+                      (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));

 }
 
 const char *
 }
 
 const char *

-disk_total(const char *mnt)
+disk_total(const char *path)

 {
        struct statvfs fs;
 
 {
        struct statvfs fs;
 

-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
+       if (statvfs(path, &fs) < 0) {
+               warn("statvfs '%s':", path);

                return NULL;
        }
 
                return NULL;
        }
 

-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+       return fmt_human(fs.f_frsize * fs.f_blocks, 1024);

 }
 
 const char *
 }
 
 const char *

-disk_used(const char *mnt)
+disk_used(const char *path)

 {
        struct statvfs fs;
 
 {
        struct statvfs fs;
 

-       if (statvfs(mnt, &fs) < 0) {
-               warn("Failed to get filesystem info");
+       if (statvfs(path, &fs) < 0) {
+               warn("statvfs '%s':", path);

                return NULL;
        }
 
                return NULL;
        }
 

-       return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+       return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);

 }
 }