[Pkg-wmaker-commits] [wmbattery] 161/241: wmbattery: Avoid uninitialized variable warning.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbattery.

commit 0a64d2bf26f90ee12159533f8bc4c10d05f4d6a6
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Fri Sep 19 23:23:23 2014 -0500

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

diff --git a/wmbattery.c b/wmbattery.c
index 91b98b8..fe219b6 100644
--- a/wmbattery.c
+++ b/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. */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git