wifi: Fix order and add missing header

[slstatus.git] / components / swap.c

diff --git a/components/swap.c b/components/swap.c
index f6f8993..caa4788 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -13,13 +13,11 @@
                size_t bytes_read;
 
                if (!(fp = fopen(path, "r"))) {
                size_t bytes_read;
 
                if (!(fp = fopen(path, "r"))) {

-                       fprintf(stderr, "fopen '%s': %s\n", path,
-                               strerror(errno));
+                       fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));

                        return 0;
                }
                        return 0;
                }

-               if ((bytes_read = fread(buf, sizeof(char), bufsiz, fp)) == 0) {
-                       fprintf(stderr, "fread '%s': %s\n", path,
-                               strerror(errno));
+               if (!(bytes_read = fread(buf, sizeof(char), bufsiz, fp))) {
+                       fprintf(stderr, "fread '%s': %s\n", path, strerror(errno));

                        fclose(fp);
                        return 0;
                }
                        fclose(fp);
                        return 0;
                }


@@ -40,12 +38,14 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%f", (float)free / 1024 / 1024);
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%f", (float)free / 1024 / 1024);


@@ -61,16 +61,19 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapCached")) == NULL)
+               if (!(match = strstr(buf, "SwapCached"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapCached: %ld kB\n", &cached);
 
                sscanf(match, "SwapCached: %ld kB\n", &cached);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%d", 100 * (total - free - cached) / total);
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%d", 100 * (total - free - cached) / total);


@@ -86,8 +89,9 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                return bprintf("%f", (float)total / 1024 / 1024);
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                return bprintf("%f", (float)total / 1024 / 1024);


@@ -103,16 +107,19 @@
                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapCached")) == NULL)
+               if (!(match = strstr(buf, "SwapCached"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapCached: %ld kB\n", &cached);
 
                sscanf(match, "SwapCached: %ld kB\n", &cached);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);


@@ -124,8 +131,6 @@
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/types.h>
        #include <unistd.h>
 

-       #define dbtoqb(b) dbtob((int64_t)(b))
-

        static void
        getstats(int *total, int *used)
        {
        static void
        getstats(int *total, int *used)
        {


@@ -133,26 +138,30 @@
                int rnswap, nswap, i;
 
                nswap = swapctl(SWAP_NSWAP, 0, 0);
                int rnswap, nswap, i;
 
                nswap = swapctl(SWAP_NSWAP, 0, 0);

-               if (nswap < 1)
+               if (nswap < 1) {

                        fprintf(stderr, "swaptctl 'SWAP_NSWAP': %s\n", strerror(errno));
                        fprintf(stderr, "swaptctl 'SWAP_NSWAP': %s\n", strerror(errno));

+               }

 
                fsep = sep = calloc(nswap, sizeof(*sep));
 
                fsep = sep = calloc(nswap, sizeof(*sep));

-               if (sep == NULL)
+               if (!sep) {

                        fprintf(stderr, "calloc 'nswap': %s\n", strerror(errno));
                        fprintf(stderr, "calloc 'nswap': %s\n", strerror(errno));

+               }

 
                rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
 
                rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);

-               if (rnswap < 0)
+               if (rnswap < 0) {

                        fprintf(stderr, "swapctl 'SWAP_STATA': %s\n", strerror(errno));
                        fprintf(stderr, "swapctl 'SWAP_STATA': %s\n", strerror(errno));

+               }

 
 

-               if (nswap != rnswap)
+               if (nswap != rnswap) {

                        fprintf(stderr, "SWAP_STATS != SWAP_NSWAP\n");
                        fprintf(stderr, "SWAP_STATS != SWAP_NSWAP\n");

+               }

 
                *total = 0;
                *used = 0;
 
                for (i = 0; i < rnswap; i++) {
 
                *total = 0;
                *used = 0;
 
                for (i = 0; i < rnswap; i++) {

-                       *total += dbtoqb(sep->se_nblks);
-                       *used += dbtoqb(sep->se_inuse);
+                       *total += sep->se_nblks >> 1;
+                       *used += sep->se_inuse >> 1;

                }
 
                free(fsep);
                }
 
                free(fsep);


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

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

        }
 
        const char *
        }
 
        const char *


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

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

        }
 
        const char *
        }
 
        const char *


@@ -195,6 +204,6 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

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

        }
 #endif
        }
 #endif