hal/hald/linux block_class_device.c,1.48,1.49

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv10122/hald/linux

Modified Files:
	block_class_device.c 
Log Message:
2004-08-02  David Zeuthen  <david at fubar.dk>

	Patch from Kay Sievers <kay.sievers at vrfy.org>
	
	* hald/linux/block_class_device.c: (detect_fs),
	(block_class_pre_process):
	* hald/linux/drive_id/drive_id.c: (drive_id_probe):
	* hald/linux/drive_id/drive_id.h:
	* hald/linux/volume_id/volume_id.c: (probe_ext), (probe_reiser),
	(probe_xfs), (probe_jfs), (probe_vfat), (probe_msdos), (probe_udf),
	(probe_iso9660), (probe_ufs), (probe_hfs_hfsplus), (probe_ntfs),
	(probe_swap), (volume_id_probe), (volume_id_open_node):
	* hald/linux/volume_id/volume_id.h:	
	Attached is a trivial cleanup of the enum names, cause 'ALL' is
	not a very good name in a global namespace. I've prepended the
	libname to all names.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- block_class_device.c	1 Aug 2004 19:56:43 -0000	1.48
+++ block_class_device.c	1 Aug 2004 23:17:02 -0000	1.49
@@ -1071,7 +1071,7 @@
 	if (vid == NULL)
 		return;
 
-	rc = volume_id_probe(vid, ALL);
+	rc = volume_id_probe(vid, VOLUME_ID_ALL);
 	if (rc != 0) {
 		volume_id_close(vid);
 		return;
@@ -1296,7 +1296,7 @@
 
 		device_file = hal_device_property_get_string (d, "block.device");
 		did = drive_id_open_node(device_file);
-		if (drive_id_probe(did, DID_ATA) == 0) {
+		if (drive_id_probe(did, DRIVE_ID_ATA) == 0) {
 			if (did->serial[0] != '\0')
 				hal_device_property_set_string (stordev, 
 								"storage.serial",
@@ -1399,7 +1399,7 @@
 
 		device_file = hal_device_property_get_string (d, "block.device");
 		did = drive_id_open_node(device_file);
-		if (drive_id_probe(did, DID_SCSI) == 0) {
+		if (drive_id_probe(did, DRIVE_ID_SCSI) == 0) {
 			if (did->serial[0] != '\0')
 				hal_device_property_set_string (stordev,
 								"storage.serial",