hal/hald/linux2/addons addon-storage.c,1.2,1.3

[David Zeuthen]

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

Modified Files:
	addon-storage.c 
Log Message:
2005-02-16  David Zeuthen  <davidz at redhat.com>

	* volume_id/luks.[ch]: New files (forgot to commit before) 

	* hald/linux2/probing/shared.h: Redefine logging a bit

	* hald/linux2/probing/probe-volume.c: Use new shared.h logging;
	implement volume_id_log and drive_id_log functions

	* hald/linux2/probing/probe-storage.c: Use new shared.h logging;
	implement volume_id_log and drive_id_log functions

	* hald/linux2/addons/addon-storage.c: Use new shared.h logging

	* drive_id/logging.h: Use drive_id_log function

	* drive_id/drive_id.h (drive_id_log): Add drive_id_log prototype



Index: addon-storage.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-storage.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addon-storage.c	11 Feb 2005 22:01:08 -0000	1.2
+++ addon-storage.c	16 Feb 2005 22:25:20 -0000	1.3
@@ -91,7 +91,7 @@
 					vol_device_file = libhal_device_get_property_string (ctx, vol_udi, 
 											     "block.device", &error);
 					if (vol_device_file != NULL) {
-						HAL_INFO (("Forcing unmount for %s", vol_device_file));
+						dbg ("Forcing unmount for %s", vol_device_file);
 
 						/* TODO: emit DeviceCondition */
 						force_unmount (vol_device_file);
@@ -233,7 +233,7 @@
 			}
 
 			if (fd < 0) {
-				HAL_INFO (("open failed for %s: %s", device_file, strerror (errno))); 
+				dbg ("open failed for %s: %s", device_file, strerror (errno)); 
 				goto skip_check;
 			}
 
@@ -265,7 +265,7 @@
 				break;
 			
 			case -1:
-				HAL_ERROR(("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno)));
+				dbg ("CDROM_DRIVE_STATUS failed: %s\n", strerror(errno));
 				break;
 				
 			default:
@@ -282,7 +282,7 @@
 				got_media = TRUE;
 				close (fd);
 			} else {
-				HAL_INFO (("open failed for %s: %s", device_file, strerror (errno))); 
+				dbg ("open failed for %s: %s", device_file, strerror (errno)); 
 				close (fd);
 				goto skip_check;
 			}
@@ -294,7 +294,7 @@
 			if (!got_media) {
 				DBusError error;
 				
-				HAL_INFO (("Media removal detected on %s", device_file));
+				dbg ("Media removal detected on %s", device_file);
 				
 				/* have to unmount all childs, but only if we're doing policy on the device */
 				if (storage_policy_should_mount)
@@ -316,7 +316,7 @@
 			if (got_media) {
 				DBusError error;
 				
-				HAL_INFO (("Media insertion detected on %s", device_file));
+				dbg ("Media insertion detected on %s", device_file);
 				/* our probe will trigger the appropriate hotplug events */
 				
 				/* could have a fs on the main block device; do a rescan to add it */
@@ -338,7 +338,7 @@
 			media_status = MEDIA_STATUS_NO_MEDIA;
 		
 		
-		HAL_INFO (("polling %s; got media=%d", device_file, got_media));
+		dbg ("polling %s; got media=%d", device_file, got_media);
 		
 	skip_check: