em/slstatus
1
0
Fork 0
Code Releases Activity

battery: Move out struct as common code

Browse Source
This commit is contained in:
Aaron Marcher 2018-05-19 01:49:46 +02:00
parent 22175f0d57
commit aac29e2bba
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/battery.c
View File

@ -5,6 +5,14 @@
#include "../util.h" #include "../util.h"
static struct {
char *state;
char *symbol;
} map[] = {
{ "Charging", "+" },
{ "Discharging", "-" },
};
#if defined(__linux__) #if defined(__linux__)
#include <limits.h> #include <limits.h>
@ -22,13 +30,6 @@
const char * const char *
battery_state(const char *bat) battery_state(const char *bat)
{ {
struct {
char *state;
char *symbol;
} map[] = {
{ "Charging", "+" },
{ "Discharging", "-" },
};
size_t i; size_t i;
char path[PATH_MAX], state[12]; char path[PATH_MAX], state[12];
@ -123,13 +124,6 @@
{ {
struct apm_power_info apm_info; struct apm_power_info apm_info;
size_t i; size_t i;
struct {
unsigned int state;
char *symbol;
} map[] = {
{ APM_AC_ON, "+" },
{ APM_AC_OFF, "-" },
};
if (load_apm_power_info(&apm_info)) { if (load_apm_power_info(&apm_info)) {
for (i = 0; i < LEN(map); i++) { for (i = 0; i < LEN(map); i++) {