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 465ffd4..c9bb920 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -48,7 +48,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

-               return fmt_human_2(free * 1024, "B");
+               return fmt_human(free * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -80,7 +80,7 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               return bprintf("%d%%", 100 * (total - free - cached) / total);
+               return bprintf("%d", 100 * (total - free - cached) / total);

        }
 
        const char *
        }
 
        const char *


@@ -98,7 +98,7 @@
                }
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                }
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               return fmt_human_2(total * 1024, "B");
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -126,7 +126,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

-               return fmt_human_2((total - free - cached) * 1024, "B");
+               return fmt_human((total - free - cached) * 1024, 1024);

        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>


@@ -178,7 +178,7 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return fmt_human_2((total - used) * 1024, "B");
+               return fmt_human((total - used) * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -188,7 +188,11 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return bprintf("%d%%", 100 * used / total);
+               if (total == 0) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 * used / total);

        }
 
        const char *
        }
 
        const char *


@@ -198,7 +202,7 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return fmt_human_2(total * 1024, "B");
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -208,6 +212,6 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return fmt_human_2(used * 1024, "B");
+               return fmt_human(used * 1024, 1024);

        }
 #endif
        }
 #endif