diff options
| author | Aaron Marcher <me@drkhsh.at> | 2018-05-02 08:49:06 +0200 |
|---|---|---|
| committer | Aaron Marcher <me@drkhsh.at> | 2018-05-02 08:49:06 +0200 |
| commit | f7a6d6c8f7d621fe7b5a9c37a130f8bf3b9bd892 (patch) | |
| tree | 16ed83d2f7ae4852aee9ca1e62395ef9953cd92d /components/wifi.c | |
| parent | 709549b4bd9fee0e0054c0dfa75fff9ac18f2862 (diff) | |
wifi: Various cleanups
Diffstat (limited to 'components/wifi.c')
| -rw-r--r-- | components/wifi.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/components/wifi.c b/components/wifi.c index 33e09b7..13b630a 100644 --- a/components/wifi.c +++ b/components/wifi.c @@ -25,20 +25,17 @@ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate"); - fp = fopen(path, "r"); - if (fp == NULL) { + if (!(fp = fopen(path, "r"))) { fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno)); return NULL; } - p = fgets(status, 5, fp); - fclose(fp); - if(!p || strcmp(status, "up\n") != 0) { + if(!(p = fgets(status, 5, fp)) || strcmp(status, "up\n") != 0) { return NULL; } + fclose(fp); - fp = fopen("/proc/net/wireless", "r"); - if (fp == NULL) { + if (!(fp = fopen("/proc/net/wireless", "r"))) { fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno)); return NULL; @@ -92,8 +89,8 @@ if (strcmp(id, "") == 0) return NULL; - else - return id; + + return id; } #elif defined(__OpenBSD__) /* unimplemented */ |