Browse Source

Remove UNUSED macro

Use variables named unused instead which is simpler
master
Aaron Marcher 6 years ago
parent
commit
b759662983
3 changed files with 3 additions and 11 deletions
  1. +2
    -6
      components/battery.c
  2. +1
    -3
      components/temperature.c
  3. +0
    -2
      util.h

+ 2
- 6
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));


+ 1
- 3
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 */


+ 0
- 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, ...);

Loading…
Cancel
Save