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

- Remove some superfluous #ifdef clutter - If we're compiling on !(Linux or FreeBSD), just emit a '?'.

Browse Source
This commit is contained in:
Jasper Lievisse Adriaanse 2012-05-04 09:36:38 +02:00 committed by Michael Stapelberg
parent 4d719ff81f
commit 6b447f7f1b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/print_eth_info.c
View File

@ -29,14 +29,9 @@
#endif
static int print_eth_speed(char *outwalk, const char *interface) {
#if defined(LINUX)
int ethspeed = 0;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
char *ethspeed;
#endif
#if defined(LINUX)
/* This code path requires root privileges */
int ethspeed = 0;
struct ifreq ifr;
struct ethtool_cmd ecmd;
@ -49,6 +44,7 @@ static int print_eth_speed(char *outwalk, const char *interface) {
return sprintf(outwalk, "%d Mbit/s", ethspeed);
} else return sprintf(outwalk, "?");
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
char *ethspeed;
struct ifmediareq ifm;
(void)memset(&ifm, 0, sizeof(ifm));
(void)strncpy(ifm.ifm_name, interface, sizeof(ifm.ifm_name));
@ -69,6 +65,8 @@ static int print_eth_speed(char *outwalk, const char *interface) {
}
ethspeed = (desc->ifmt_string != NULL ? desc->ifmt_string : "?");
return sprintf(outwalk, "%s", ethspeed);
#else
return sprintf(outwalk, "?");
#endif
}