slstatus

commit b759662983a159da8a3c361f4f222287b2e43331
parent fc8b6f81a54810faa844ea21d08ef47f95b8f4e0
Author: Aaron Marcher <me@drkhsh.at>
Date:   Thu, 17 May 2018 20:05:57 +0200

Remove UNUSED macro

Use variables named unused instead which is simpler

Diffstat:
M
components/battery.c
 | 
8
++------
M
components/temperature.c
 | 
4
+---
M
util.h
 | 
2
--

3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/components/battery.c b/components/battery.c
@@ -52,13 +52,11 @@
 	#include <unistd.h>
 
 	const char *
-	battery_perc(const char *bat)
+	battery_perc(const char *unused)
 	{
 		struct apm_power_info apm_info;
 		int fd;
 
-		UNUSED(bat); /* no way to specify battery on OpenBSD */
-
 		fd = open("/dev/apm", O_RDONLY);
 		if (fd < 0) {
 			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
@@ -77,7 +75,7 @@
 	}
 
 	const char *
-	battery_state(const char *bat)
+	battery_state(const char *unused)
 	{
 		int fd;
 		size_t i;
@@ -90,8 +88,6 @@
 			{ APM_AC_OFF,     "-" },
 		};
 
-		UNUSED(bat); /* no way to specify battery on OpenBSD */
-
 		fd = open("/dev/apm", O_RDONLY);
 		if (fd < 0) {
 			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
diff --git a/components/temperature.c b/components/temperature.c
@@ -21,14 +21,12 @@
 	#include <sys/sysctl.h>
 
 	const char *
-	temp(const char *file)
+	temp(const char *unused)
 	{
 		int mib[5];
 		size_t size;
 		struct sensor temp;
 
-		UNUSED(file); /* no temperature file on OpenBSD */
-
 		mib[0] = CTL_HW;
 		mib[1] = HW_SENSORS;
 		mib[2] = 0; /* cpu0 */
diff --git a/util.h b/util.h
@@ -3,7 +3,5 @@ extern char buf[1024];
 
 #define LEN(x) (sizeof (x) / sizeof *(x))
 
-#define UNUSED(x) (void)x
-
 const char *bprintf(const char *fmt, ...);
 int pscanf(const char *path, const char *fmt, ...);