From aac29e2bba1d34762971718c40004f37415d411e Mon Sep 17 00:00:00 2001 From: Aaron Marcher Date: Sat, 19 May 2018 01:49:46 +0200 Subject: battery: Move out struct as common code --- components/battery.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'components') diff --git a/components/battery.c b/components/battery.c index 3965e8f..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 @@ -22,13 +30,6 @@ const char * battery_state(const char *bat) { - struct { - char *state; - char *symbol; - } map[] = { - { "Charging", "+" }, - { "Discharging", "-" }, - }; size_t i; char path[PATH_MAX], state[12]; @@ -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++) { -- cgit v1.2.3