hal/hald device_info.c,1.30,1.31

[Kay Sievers]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv815/hald

Modified Files:
	device_info.c 
Log Message:
2006-01-20  Kay Sievers  <kay.sievers at vrfy.org>

        * hald/device_info.c: (resolve_udiprop_path), (handle_match):
        * hald/linux2/blockdev.c: (hotplug_event_begin_add_blockdev):
        * hald/linux2/physdev.c: (scsi_add): Add scsi.type, scsi.vendor,
        scsi.model for the scsi device and merge these properties to the
        storage device instead of using the "device" link in sysfs.



Index: device_info.c
===================================================================
RCS file: /cvs/hal/hal/hald/device_info.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- device_info.c	12 Jan 2006 17:48:44 -0000	1.30
+++ device_info.c	20 Jan 2006 15:40:03 -0000	1.31
@@ -190,7 +190,6 @@
 		goto out;
 	}
 
-	
 	/* Start with the source udi */
 	strncpy (udi_result, source_udi, udi_result_size);
 
@@ -232,7 +231,7 @@
 			strncpy (udi_result, newudi, udi_result_size);
 		} else {
 			/*HAL_INFO (("new_udi = '%s'", curtoken));*/
-			strncpy (udi_result, curtoken, udi_result_size);			
+			strncpy (udi_result, curtoken, udi_result_size);
 		}
 
 	}
@@ -528,7 +527,6 @@
 
 		/*HAL_INFO (("is_absolute=%d, should_be=%d, path='%s'", is_absolute_path, should_be_absolute_path, path));*/
 
-
 		if (should_be_absolute_path) {
 			if (is_absolute_path)
 				return TRUE;