marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused variables, use correct limit constants

Browse Source
This commit is contained in:
Michael Stapelberg 2009-01-25 20:24:34 +01:00
parent 7fe3b0657b
commit 4e19825564
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wmiistatus.c
View File

@ -307,8 +307,7 @@ static char *get_wireless_info() {
int quality; int quality;
if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1) if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1)
continue; continue;
/* for some reason, I get 255 sometimes */ if ((quality == UCHAR_MAX) || (quality == 0)) {
if ((quality == 255) || (quality == 0)) {
if (use_colors) if (use_colors)
(void)snprintf(part, sizeof(part), "%s%s", (void)snprintf(part, sizeof(part), "%s%s",
concat("#FF0000 ", wmii_normcolors), " W: down"); concat("#FF0000 ", wmii_normcolors), " W: down");
@ -359,14 +358,13 @@ static char *get_eth_info() {
/* This code path requires root privileges */ /* This code path requires root privileges */
struct ifreq ifr; struct ifreq ifr;
struct ethtool_cmd ecmd; struct ethtool_cmd ecmd;
int err;
ecmd.cmd = ETHTOOL_GSET; ecmd.cmd = ETHTOOL_GSET;
(void)memset(&ifr, 0, sizeof(ifr)); (void)memset(&ifr, 0, sizeof(ifr));
ifr.ifr_data = (caddr_t)&ecmd; ifr.ifr_data = (caddr_t)&ecmd;
(void)strcpy(ifr.ifr_name, eth_interface); (void)strcpy(ifr.ifr_name, eth_interface);
if ((err = ioctl(general_socket, SIOCETHTOOL, &ifr)) == 0) if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0)
ethspeed = (ecmd.speed == 65535 ? 0 : ecmd.speed); ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed);
else get_ethspeed = false; else get_ethspeed = false;
} }
@ -388,10 +386,10 @@ static char *get_eth_info() {
static bool process_runs(const char *path) { static bool process_runs(const char *path) {
char pidbuf[512], char pidbuf[512],
procbuf[512]; procbuf[512];
ssize_t n;
static glob_t globbuf; static glob_t globbuf;
struct stat statbuf; struct stat statbuf;
int fd; int fd;
memset(pidbuf, 0, sizeof(pidbuf));
if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0)
die("glob() failed"); die("glob() failed");
@ -399,8 +397,7 @@ static bool process_runs(const char *path) {
globfree(&globbuf); globfree(&globbuf);
if (fd < 0) if (fd < 0)
return false; return false;
if ((n = read(fd, pidbuf, sizeof(pidbuf))) > 0) (void)read(fd, pidbuf, sizeof(pidbuf));
pidbuf[n] = '\0';
(void)close(fd); (void)close(fd);
(void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10)); (void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10));