[PATCH 6/8] wmbattery: Avoid uninitialized variable warning.

[Doug Torrance]

Move assignment of old_status until after cur_info is initialized in
wmbattery.c.
---
 wmbattery/wmbattery.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wmbattery/wmbattery.c b/wmbattery/wmbattery.c
index 91b98b8..fe219b6 100644
--- a/wmbattery/wmbattery.c
+++ b/wmbattery/wmbattery.c
@@ -528,7 +528,6 @@ void alarmhandler(int sig) {
        apm_info cur_info;
        int old_status;
 
-       old_status = cur_info.battery_status;
 #ifdef UPOWER
        if (use_upower) {
                if (upower_read(1, &cur_info) != 0)
@@ -555,7 +554,9 @@ void alarmhandler(int sig) {
                if (sonypi_read(&cur_info) != 0)
                        error("Cannot read sonypi information.");
        }
-       
+
+       old_status = cur_info.battery_status;
+
        /* Always calculate remaining lifetime? apm and acpi both use a
         * negative number here to indicate error, missing battery, or
         * cannot determine time. */
-- 
1.9.1


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.