X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/f170028527bdccead9a99797b45011d5e76100f1..a37224bf7b7eed62ff7574cc667202e905fc0d43:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index c7c402a..b086a28 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -5,6 +5,14 @@
 
 #include "../util.h"
 
+static struct {
+	char *state;
+	char *symbol;
+} map[] = {
+	{ "Charging",    "+" },
+	{ "Discharging", "-" },
+};
+
 #if defined(__linux__)
 	#include <limits.h>
 
@@ -16,19 +24,12 @@
 
 		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
 		         bat, "/capacity");
-		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
+		return (pscanf(path, "%d", &perc) == 1) ? bprintf("%d", perc) : NULL;
 	}
 
 	const char *
 	battery_state(const char *bat)
 	{
-		struct {
-			char *state;
-			char *symbol;
-		} map[] = {
-			{ "Charging",    "+" },
-			{ "Discharging", "-" },
-		};
 		size_t i;
 		char path[PATH_MAX], state[12];
 
@@ -62,12 +63,12 @@
 		if (!strcmp(state, "Discharging")) {
 			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
 					 bat, "/charge_now");
-			if (pscanf(path, "%i", &charge_now) != 1) {
+			if (pscanf(path, "%d", &charge_now) != 1) {
 				return NULL;
 			}
 			snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
 					 bat, "/current_now");
-			if (pscanf(path, "%i", &current_now) != 1) {
+			if (pscanf(path, "%d", &current_now) != 1) {
 				return NULL;
 			}
 
@@ -123,13 +124,6 @@
 	{
 		struct apm_power_info apm_info;
 		size_t i;
-		struct {
-			unsigned int state;
-			char *symbol;
-		} map[] = {
-			{ APM_AC_ON,      "+" },
-			{ APM_AC_OFF,     "-" },
-		};
 
 		if (load_apm_power_info(&apm_info)) {
 			for (i = 0; i < LEN(map); i++) {