Change to fmt_human in netspeeds on OpenBSD

[slstatus.git] / components / swap.c

diff --git a/components/swap.c b/components/swap.c
index 234e7d1..37ee85c 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 bprintf("%f", (float)free / 1024 / 1024);
+               return fmt_human(free * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


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

+               if (total == 0) {
+                       return NULL;
+               }
+

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


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

-               return bprintf("%f", (float)total / 1024 / 1024);
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -122,7 +126,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                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>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>


@@ -131,29 +135,27 @@
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/types.h>
        #include <unistd.h>
 

-       static void
+       static int

        getstats(int *total, int *used)
        {
                struct swapent *sep, *fsep;
                int rnswap, nswap, i;
 
        getstats(int *total, int *used)
        {
                struct swapent *sep, *fsep;
                int rnswap, nswap, i;
 

-               nswap = swapctl(SWAP_NSWAP, 0, 0);
-               if (nswap < 1) {
+               if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) < 1) {

                        warn("swaptctl 'SWAP_NSWAP':");
                        warn("swaptctl 'SWAP_NSWAP':");

+                       return 1;

                }
                }

-
-               fsep = sep = calloc(nswap, sizeof(*sep));
-               if (!sep) {
+               if (!(fsep = sep = calloc(nswap, sizeof(*sep)))) {

                        warn("calloc 'nswap':");
                        warn("calloc 'nswap':");

+                       return 1;

                }
                }

-
-               rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
-               if (rnswap < 0) {
+               if ((rnswap = swapctl(SWAP_STATS, (void *)sep, nswap)) < 0) {

                        warn("swapctl 'SWAP_STATA':");
                        warn("swapctl 'SWAP_STATA':");

+                       return 1;

                }
                }

-

                if (nswap != rnswap) {
                        warn("getstats: SWAP_STATS != SWAP_NSWAP");
                if (nswap != rnswap) {
                        warn("getstats: SWAP_STATS != SWAP_NSWAP");

+                       return 1;

                }
 
                *total = 0;
                }
 
                *total = 0;


@@ -165,6 +167,8 @@
                }
 
                free(fsep);
                }
 
                free(fsep);

+
+               return 0;

        }
 
        const char *
        }
 
        const char *


@@ -172,9 +176,11 @@
        {
                int total, used;
 
        {
                int total, used;
 

-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }

 
 

-               return bprintf("%f", (float)(total - used) / 1024 / 1024);
+               return fmt_human((total - used) * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -182,7 +188,13 @@
        {
                int total, used;
 
        {
                int total, used;
 

-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               if (total == 0) {
+                       return NULL;
+               }

 
                return bprintf("%d", 100 * used / total);
        }
 
                return bprintf("%d", 100 * used / total);
        }


@@ -192,9 +204,11 @@
        {
                int total, used;
 
        {
                int total, used;
 

-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }

 
 

-               return bprintf("%f", (float)total / 1024 / 1024);
+               return fmt_human(total * 1024, 1024);

        }
 
        const char *
        }
 
        const char *


@@ -202,8 +216,10 @@
        {
                int total, used;
 
        {
                int total, used;
 

-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }

 
 

-               return bprintf("%f", (float)used / 1024 / 1024);
+               return fmt_human(used * 1024, 1024);

        }
 #endif
        }
 #endif