Fix whitespace

[slstatus.git] / components / wifi.c

diff --git a/components/wifi.c b/components/wifi.c
index 9de543b..8863252 100644 (file)
--- a/components/wifi.c
+++ b/components/wifi.c
@@ -15,15 +15,14 @@
        const char *
        wifi_perc(const char *interface)
        {
        const char *
        wifi_perc(const char *interface)
        {

-               int i, cur;
-               int total = 70; /* the max of /proc/net/wireless */
+               int cur;
+               size_t i;

                char *p, *datastart;
                char path[PATH_MAX];
                char status[5];
                FILE *fp;
 
                char *p, *datastart;
                char path[PATH_MAX];
                char status[5];
                FILE *fp;
 

-               if (esnprintf(path, sizeof(path),
-                             "/sys/class/net/%s/operstate",
+               if (esnprintf(path, sizeof(path), "/sys/class/net/%s/operstate",

                              interface) < 0) {
                        return NULL;
                }
                              interface) < 0) {
                        return NULL;
                }


@@ -33,7 +32,7 @@
                }
                p = fgets(status, 5, fp);
                fclose(fp);
                }
                p = fgets(status, 5, fp);
                fclose(fp);

-               if(!p || strcmp(status, "up\n") != 0) {
+               if (!p || strcmp(status, "up\n") != 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -59,7 +58,8 @@
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
                       "%*d\t\t%*d\t\t %*d\t  %*d\t\t %*d", &cur);
 
                sscanf(datastart + 1, " %*d   %d  %*d  %*d\t\t  %*d\t   "
                       "%*d\t\t%*d\t\t %*d\t  %*d\t\t %*d", &cur);
 

-               return bprintf("%d", (int)((float)cur / total * 100));
+               /* 70 is the max of /proc/net/wireless */
+               return bprintf("%d", (int)((float)cur / 70 * 100));

        }
 
        const char *
        }
 
        const char *


@@ -71,8 +71,8 @@
 
                memset(&wreq, 0, sizeof(struct iwreq));
                wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
 
                memset(&wreq, 0, sizeof(struct iwreq));
                wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;

-               if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name),
-                             "%s", interface) < 0) {
+               if (esnprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s",
+                             interface) < 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 


@@ -150,8 +150,9 @@
                        if (nr.nr_max_rssi) {
                                q = IEEE80211_NODEREQ_RSSI(&nr);
                        } else {
                        if (nr.nr_max_rssi) {
                                q = IEEE80211_NODEREQ_RSSI(&nr);
                        } else {

-                               q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
-                               (2 * (nr.nr_rssi + 100)));
+                               q = nr.nr_rssi >= -50 ? 100 :
+                                   (nr.nr_rssi <= -100 ? 0 :
+                                   (2 * (nr.nr_rssi + 100)));

                        }
                        return bprintf("%d", q);
                }
                        }
                        return bprintf("%d", q);
                }