Revert aac29e2 as it is nonsense

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 3965e8f..90e8590 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -22,7 +22,7 @@
        const char *
        battery_state(const char *bat)
        {
        const char *
        battery_state(const char *bat)
        {

-               struct {
+               static struct {

                        char *state;
                        char *symbol;
                } map[] = {
                        char *state;
                        char *symbol;
                } map[] = {


@@ -121,8 +121,6 @@
        const char *
        battery_state(const char *unused)
        {
        const char *
        battery_state(const char *unused)
        {

-               struct apm_power_info apm_info;
-               size_t i;

                struct {
                        unsigned int state;
                        char *symbol;
                struct {
                        unsigned int state;
                        char *symbol;


@@ -130,6 +128,8 @@
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },
                };
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },
                };

+               struct apm_power_info apm_info;
+               size_t i;

 
                if (load_apm_power_info(&apm_info)) {
                        for (i = 0; i < LEN(map); i++) {
 
                if (load_apm_power_info(&apm_info)) {
                        for (i = 0; i < LEN(map); i++) {