hal/hald/linux2/probing probe-storage.c,1.12,1.13

David Zeuthen david at freedesktop.org
Mon Jul 25 21:40:45 PDT 2005


Update of /cvs/hal/hal/hald/linux2/probing
In directory gabe:/tmp/cvs-serv14737/hald/linux2/probing

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

        * drive_id/ata.c, drive_id/drive_id.c, drive_id/scsi.c,
        hald/device.c, hald/device_store.c, hald/linux2/apm.c,
        hald/linux2/osspec.c, hald/linux2/pcmcia_utils.c,
        hald/linux2/probing/probe-storage.c, tools/hal-device.c,
        volume_id/fat.c, volume_id/iso9660.c, volume_id/isw_raid.c,
        volume_id/lvm.c, volume_id/romfs.c, volume_id/volume_id.c: This is
        a patch (against CVS) to fix several compiler warnings with gcc
        3.x and 4.x. Please review. Patch from Danny Kukawka
        <danny.kukawka at web.de>.



Index: probe-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-storage.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- probe-storage.c	22 Jul 2005 18:57:29 -0000	1.12
+++ probe-storage.c	26 Jul 2005 04:40:43 -0000	1.13
@@ -167,7 +167,7 @@
 				if (did->serial[0] != '\0') {
 					dbus_error_init (&error);
 					if (!libhal_device_set_property_string (ctx, udi, "storage.serial", 
-										did->serial, &error)) {
+										(char *) did->serial, &error)) {
 						dbg ("Error setting storage.serial");
 					}
 				}
@@ -175,7 +175,7 @@
 				if (did->firmware[0] != '\0') {
 					dbus_error_init (&error);
 					if (!libhal_device_set_property_string (ctx, udi, "storage.firmware_version", 
-										did->firmware, &error)) {
+										(char *) did->firmware, &error)) {
 						dbg ("Error setting storage.firmware_version");
 					}
 				}




More information about the hal-commit mailing list