Merge fmt_human_2 and fmt_human_10 to one function

[slstatus.git] / components / swap.c

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