X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7e3f80c1a39e16973f3c9235d3f9d85df0d1b995..2289798b6d3565d96cc81d5208c50afa2010e296:/components/battery.c?ds=sidebyside

diff --git a/components/battery.c b/components/battery.c
index 4314e81..cd1169d 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,10 +1,9 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
 #include <stdio.h>
-#ifdef __linux__
+#if defined(__linux__)
 #include <limits.h>
 #include <string.h>
-#elif __OpenBSD__
+#elif defined(__OpenBSD__)
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -16,25 +15,25 @@
 const char *
 battery_perc(const char *bat)
 {
-#ifdef __linux__
+#if defined(__linux__)
 	int perc;
 	char path[PATH_MAX];
 
 	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
 	return (pscanf(path, "%i", &perc) == 1) ?
 	       bprintf("%d", perc) : NULL;
-#elif __OpenBSD__
+#elif defined(__OpenBSD__)
 	struct apm_power_info apm_info;
 	int fd;
 
 	fd = open("/dev/apm", O_RDONLY);
 	if (fd < 0) {
-		warn("Failed to open file /dev/apm");
+		fprintf(stderr, "Failed to open file /dev/apm");
 		return NULL;
 	}
 
 	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-		warn("Failed to get battery info");
+		fprintf(stderr, "Failed to get battery info");
 		close(fd);
 		return NULL;
 	}
@@ -44,7 +43,7 @@ battery_perc(const char *bat)
 #endif
 }
 
-#ifdef __linux__
+#if defined(__linux__)
 const char *
 battery_power(const char *bat)
 {