hal/hald/linux2/addons addon-acpi.c,1.14,1.15

Danny Kukawka dkukawka at freedesktop.org
Mon Feb 13 06:35:33 PST 2006


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

Modified Files:
	addon-acpi.c 
Log Message:
2006-02-13  Danny Kukawka  <danny.kukawka at web.de>

        Fixed problems with usage of dbus_error within a for-block. Need
        to be sure that the error is empty and initialised for each usage.
        If not we get potentially error messages from dbus. :

        * hald/linux2/addons/addon-acpi.c: (main_loop):
        * tools/lshal.c: (dump_devices):



Index: addon-acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-acpi.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- addon-acpi.c	8 Feb 2006 13:54:44 -0000	1.14
+++ addon-acpi.c	13 Feb 2006 14:35:31 -0000	1.15
@@ -142,7 +142,12 @@
 		} else {
 			dbg ("cannot parse event");
 		}
-		
+
+		if (dbus_error_is_set (&error)) {
+	        	/* Free the error (which include a dbus_error_init()) 
+			   This should prevent errors if a call above fails */
+			dbus_error_free (&error);
+		}
 	}
 
 	dbus_error_free (&error);




More information about the hal-commit mailing list