sheldonmlee/slstatus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wifi: Fix coding style

Browse Source 
Use block for single statement ifs
When functions return -1 for error test against 0 not -1
Newlines
This commit is contained in:
Aaron Marcher 2018-05-16 23:17:30 +02:00
parent 9d967498be
commit bb61392386
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/wifi.c
View File

@ -106,15 +106,16 @@
{ {
struct ieee80211_bssid bssid; struct ieee80211_bssid bssid;
int sockfd; int sockfd;
memset(&bssid, 0, sizeof(bssid)); memset(&bssid, 0, sizeof(bssid));
memset(nr, 0, sizeof(struct ieee80211_nodereq)); memset(nr, 0, sizeof(struct ieee80211_nodereq));
if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
fprintf(stderr, "socket 'AF_INET': %s\n", fprintf(stderr, "socket 'AF_INET': %s\n",
strerror(errno)); strerror(errno));
return 0; return 0;
} }
strlcpy(bssid.i_name, iface, sizeof(bssid.i_name)); strlcpy(bssid.i_name, iface, sizeof(bssid.i_name));
if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) == -1) { if ((ioctl(sockfd, SIOCG80211BSSID, &bssid)) < 0) {
fprintf(stderr, "ioctl 'SIOCG80211BSSID': %s\n", fprintf(stderr, "ioctl 'SIOCG80211BSSID': %s\n",
strerror(errno)); strerror(errno));
close(sockfd); close(sockfd);
@ -122,14 +123,14 @@
} }
strlcpy(nr->nr_ifname, iface, sizeof(nr->nr_ifname)); strlcpy(nr->nr_ifname, iface, sizeof(nr->nr_ifname));
memmove(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr)); memmove(&nr->nr_macaddr, bssid.i_bssid, sizeof(nr->nr_macaddr));
if ((ioctl(sockfd, SIOCG80211NODE, nr)) == -1 && nr->nr_rssi) { if ((ioctl(sockfd, SIOCG80211NODE, nr)) < 0 && nr->nr_rssi) {
fprintf(stderr, "ioctl 'SIOCG80211NODE': %s\n", fprintf(stderr, "ioctl 'SIOCG80211NODE': %s\n",
strerror(errno)); strerror(errno));
close(sockfd); close(sockfd);
return 0; return 0;
} }
return close(sockfd), 1;
return close(sockfd), 1;
} }
const char * const char *
@ -139,13 +140,15 @@
int q; int q;
if (load_ieee80211_nodereq(iface, &nr)) { if (load_ieee80211_nodereq(iface, &nr)) {
if (nr.nr_max_rssi) if (nr.nr_max_rssi) {
q = IEEE80211_NODEREQ_RSSI(&nr); q = IEEE80211_NODEREQ_RSSI(&nr);
else } else {
q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 : q = nr.nr_rssi >= -50 ? 100 : (nr.nr_rssi <= -100 ? 0 :
(2 * (nr.nr_rssi + 100))); (2 * (nr.nr_rssi + 100)));
}
return bprintf("%d", q); return bprintf("%d", q);
} }
return NULL; return NULL;
} }
@ -157,7 +160,7 @@
if (load_ieee80211_nodereq(iface, &nr)) { if (load_ieee80211_nodereq(iface, &nr)) {
return bprintf("%s", nr.nr_nwid); return bprintf("%s", nr.nr_nwid);
} }
return NULL; return NULL;
} }
#endif #endif