hal/libhal-storage libhal-storage.c,1.19,1.20

David Zeuthen david at freedesktop.org
Fri Jul 22 11:57:31 PDT 2005


Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv7030/libhal-storage

Modified Files:
	libhal-storage.c 
Log Message:
2005-07-22  David Zeuthen  <davidz at redhat.com>

        * hald/linux2/probing/probe-hiddev.c,
        hald/linux2/probing/probe-input.c,
        hald/linux2/probing/probe-printer.c,
        hald/linux2/probing/probe-smbios.c,
        hald/linux2/probing/probe-storage.c,
        hald/linux2/probing/probe-volume.c: Here a little patch (against
        CVS) to fix several compiler warnings. Patch from Danny Kukawka
        <danny.kukawka at web.de>.



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- libhal-storage.c	21 Jul 2005 20:26:46 -0000	1.19
+++ libhal-storage.c	22 Jul 2005 18:57:29 -0000	1.20
@@ -1493,7 +1493,7 @@
 {
 	DBusError error;
 
-	LIBHAL_CHECK_LIBHALCONTEXT(hal_ctx, NULL);
+	LIBHAL_CHECK_LIBHALCONTEXT(hal_ctx, FALSE);
 
 	dbus_error_init (&error);
 	return libhal_device_get_property_bool (hal_ctx, "/org/freedesktop/Hal/devices/computer",
@@ -1555,7 +1555,10 @@
 	LibHalPropertySetIterator it;
 	DBusError error;
 
-	LIBHAL_CHECK_LIBHALCONTEXT(hal_ctx, NULL);
+	if(hal_ctx == 0) {
+		fprintf (stderr,"%s %d : LibHalContext *ctx is NULL\n",__FILE__, __LINE__);
+		return;
+	}
 
 	dbus_error_init (&error);
 




More information about the hal-commit mailing list