lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove UNUSED macro

Browse source 
Use variables named unused instead which is simpler
This commit is contained in:
Aaron Marcher 2018-05-17 20:05:57 +02:00
parent fc8b6f81a5
commit b759662983
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/battery.c
View file

@ -52,13 +52,11 @@
#include <unistd.h> #include <unistd.h>
const char * const char *
battery_perc(const char *bat) battery_perc(const char *unused)
{ {
struct apm_power_info apm_info; struct apm_power_info apm_info;
int fd; int fd;
UNUSED(bat); /* no way to specify battery on OpenBSD */
fd = open("/dev/apm", O_RDONLY); fd = open("/dev/apm", O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno)); fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
@ -77,7 +75,7 @@
} }
const char * const char *
battery_state(const char *bat) battery_state(const char *unused)
{ {
int fd; int fd;
size_t i; size_t i;
@ -90,8 +88,6 @@
{ APM_AC_OFF, "-" }, { APM_AC_OFF, "-" },
}; };
UNUSED(bat); /* no way to specify battery on OpenBSD */
fd = open("/dev/apm", O_RDONLY); fd = open("/dev/apm", O_RDONLY);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno)); fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));

4
components/temperature.c
View file

@ -21,14 +21,12 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
const char * const char *
temp(const char *file) temp(const char *unused)
{ {
int mib[5]; int mib[5];
size_t size; size_t size;
struct sensor temp; struct sensor temp;
UNUSED(file); /* no temperature file on OpenBSD */
mib[0] = CTL_HW; mib[0] = CTL_HW;
mib[1] = HW_SENSORS; mib[1] = HW_SENSORS;
mib[2] = 0; /* cpu0 */ mib[2] = 0; /* cpu0 */

2
util.h
View file

@ -3,7 +3,5 @@ extern char buf[1024];
#define LEN(x) (sizeof (x) / sizeof *(x)) #define LEN(x) (sizeof (x) / sizeof *(x))
#define UNUSED(x) (void)x
const char *bprintf(const char *fmt, ...); const char *bprintf(const char *fmt, ...);
int pscanf(const char *path, const char *fmt, ...); int pscanf(const char *path, const char *fmt, ...);