hal/hald/linux2/addons addon-acpi.c, 1.9, 1.10 addon-pmu.c, 1.2, 1.3 addon-storage.c, 1.10, 1.11

[Danny Kukawka]

Update of /cvs/hal/hal/hald/linux2/addons
In directory gabe:/tmp/cvs-serv4600/hald/linux2/addons

Modified Files:
	addon-acpi.c addon-pmu.c addon-storage.c 
Log Message:
2005-08-11  Danny Kukawka <danny.kukawka at web.de>

        * hald/linux2/acpi.c, hald/linux2/addons/addon-acpi.c
        hald/linux2/addons/addon-pmu.c, hald/linux2/addons/addon-storage.c,
        hald/linux2/pmu.c: (battery_refresh): Fixed several compiler warnings
        and removed unused variables.



Index: addon-acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-acpi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- addon-acpi.c	6 Aug 2005 13:15:42 -0000	1.9
+++ addon-acpi.c	11 Aug 2005 21:19:57 -0000	1.10
@@ -94,7 +94,6 @@
 	struct sockaddr_un addr;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char acpi_path[256];
 	char acpi_name[256];
 	unsigned int acpi_num1;

Index: addon-pmu.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-pmu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addon-pmu.c	29 Jul 2005 20:32:57 -0000	1.2
+++ addon-pmu.c	11 Aug 2005 21:19:57 -0000	1.3
@@ -99,8 +99,6 @@
 
 		n = write (fd, buf, 2);
 		if (n == 2) {
-			int i;
-
 			rd = read (fd, buf, sizeof (buf));
 			if (rd <= 0) {
 				dbg ("Error reading from fd; read returned %d; err=%s", strerror (errno));
@@ -108,6 +106,8 @@
 			}
 
 #if 0
+			int i;
+			
 			dbg ("Read 0x%02x bytes", rd);				
 			for (i = 0; i < rd; i++) {
 				dbg ("%02x : 0x%02x", i, buf[i]);

Index: addon-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-storage.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- addon-storage.c	29 Jul 2005 20:32:57 -0000	1.10
+++ addon-storage.c	11 Aug 2005 21:19:57 -0000	1.11
@@ -152,7 +152,6 @@
 	char *device_file;
 	LibHalContext *ctx = NULL;
 	DBusError error;
-	DBusConnection *conn;
 	char *bus;
 	char *drive_type;
 	int is_cdrom;