hal/tools fstab-sync.c,1.30,1.31

[David Zeuthen]

Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv28059/tools

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

	Patch from John (J5) Palmieri <johnp at redhat.com>.

	* libhal-storage/libhal-storage.[ch]: Rename all functions, symbols
	and defines from hal_storage to libhal_storage.

	* tools/fstab-sync.c: Update for changes in libhal-storage



Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- fstab-sync.c	10 Feb 2005 17:03:57 -0000	1.30
+++ fstab-sync.c	16 Feb 2005 18:45:19 -0000	1.31
@@ -1146,8 +1146,8 @@
 static char* add_hal_device (FSTable *table, const char *udi)
 {
 	char *rc;
-	HalDrive *drive;
-	HalVolume *volume;
+	LibHalDrive *drive;
+	LibHalVolume *volume;
 	FSTableLine *line;
 	char final_options[256];
 	
@@ -1157,7 +1157,7 @@
 	
 	fstab_update_debug (_("%d: entering add_hal_device, udi='%s'\n"), pid, udi);
 	
-	drive  = hal_drive_from_udi (hal_context, udi);
+	drive  = libhal_drive_from_udi (hal_context, udi);
 	/*fstab_update_debug (_("%d: drive=%x, volume=%x\n"), pid, drive, volume);*/
 	if (drive == NULL) {
 		char *udi_storage_device;
@@ -1167,13 +1167,13 @@
 		udi_storage_device = libhal_device_get_property_string (hal_context, udi, "block.storage_device", &error);
 		if (udi_storage_device == NULL)
 			goto out;
-		drive = hal_drive_from_udi (hal_context, udi_storage_device);
+		drive = libhal_drive_from_udi (hal_context, udi_storage_device);
 		libhal_free_string (udi_storage_device);
 		if (drive == NULL)
 			goto out;
 	}
 
-	volume = hal_volume_from_udi (hal_context, udi);
+	volume = libhal_volume_from_udi (hal_context, udi);
 		
 	/* see if we are a drive */
 	if (volume == NULL) {
@@ -1184,10 +1184,10 @@
 		const char *fstype;
 		const char *options;
 		
-		if (!hal_drive_policy_is_mountable (drive, NULL))
+		if (!libhal_drive_policy_is_mountable (drive, NULL))
 			goto out;
 		
-		device_file = hal_drive_get_device_file (drive);
+		device_file = libhal_drive_get_device_file (drive);
 		if (device_file == NULL)
 			goto out;
 
@@ -1197,7 +1197,7 @@
 			goto out;
 		}
 		
-		desired_mount_point = hal_drive_policy_get_desired_mount_point (drive, NULL);
+		desired_mount_point = libhal_drive_policy_get_desired_mount_point (drive, NULL);
 		if (desired_mount_point == NULL)
 			goto out;
 
@@ -1205,10 +1205,10 @@
 		if (normalized_desired_mount_point == NULL)
 			goto out;
 		
-		fstype = hal_drive_policy_get_mount_fs (drive, NULL);
+		fstype = libhal_drive_policy_get_mount_fs (drive, NULL);
 		if (fstype == NULL)
 			goto out;
-		options = hal_drive_policy_get_mount_options (drive, NULL);
+		options = libhal_drive_policy_get_mount_options (drive, NULL);
 		if (options == NULL)
 			goto out;
 		
@@ -1247,14 +1247,14 @@
 		const char *options;
 		
 		/* means we are a volume */
-		if (!hal_volume_policy_is_mountable (drive, volume, NULL))
+		if (!libhal_volume_policy_is_mountable (drive, volume, NULL))
 			goto out;
 		
-		device_file = hal_volume_get_device_file (volume);
+		device_file = libhal_volume_get_device_file (volume);
 		if (device_file == NULL)
 			goto out;
 		
-		label = hal_volume_get_label (volume);
+		label = libhal_volume_get_label (volume);
 		if (device_file == NULL)
 			goto out;
 		
@@ -1264,7 +1264,7 @@
 			goto out;
 		}
 		
-		desired_mount_point = hal_volume_policy_get_desired_mount_point (drive, volume, NULL);
+		desired_mount_point = libhal_volume_policy_get_desired_mount_point (drive, volume, NULL);
 		if (desired_mount_point == NULL)
 			goto out;
 
@@ -1272,10 +1272,10 @@
 		if (normalized_desired_mount_point == NULL)
 			goto out;
 		
-		fstype = hal_volume_policy_get_mount_fs (drive, volume, NULL);
+		fstype = libhal_volume_policy_get_mount_fs (drive, volume, NULL);
 		if (fstype == NULL)
 			goto out;
-		options = hal_volume_policy_get_mount_options (drive, volume, NULL);
+		options = libhal_volume_policy_get_mount_options (drive, volume, NULL);
 		if (options == NULL)
 			goto out;
 		
@@ -1310,8 +1310,8 @@
 	
 	
 out:
-	hal_volume_free (volume);
-	hal_drive_free (drive);
+	libhal_volume_free (volume);
+	libhal_drive_free (drive);
 	return rc;
 }
 
@@ -1803,16 +1803,16 @@
 	  goto out;
   }
 
-  fsy_mount_root = hal_drive_policy_default_get_mount_root (hal_context);
+  fsy_mount_root = libhal_drive_policy_default_get_mount_root (hal_context);
   if (fsy_mount_root == NULL)
 	  goto out;
   fstab_update_debug (_("%d: mount_root='%s'\n"), pid, fsy_mount_root);
-  fsy_use_managed = hal_drive_policy_default_use_managed_keyword (hal_context);
+  fsy_use_managed = libhal_drive_policy_default_use_managed_keyword (hal_context);
   fstab_update_debug (_("%d: use_managed=%d\n"), pid, fsy_use_managed);
   if (fsy_use_managed) {
-	  if ((fsy_managed_primary   = hal_drive_policy_default_get_managed_keyword_primary (hal_context)) == NULL)
+	  if ((fsy_managed_primary   = libhal_drive_policy_default_get_managed_keyword_primary (hal_context)) == NULL)
 		  goto out;
-	  if ((fsy_managed_secondary = hal_drive_policy_default_get_managed_keyword_secondary (hal_context)) == NULL)
+	  if ((fsy_managed_secondary = libhal_drive_policy_default_get_managed_keyword_secondary (hal_context)) == NULL)
 		  goto out;
 	  fstab_update_debug (_("%d: managed primary='%s'\n"), pid, fsy_managed_primary);
 	  fstab_update_debug (_("%d: managed secondary='%s'\n"), pid, fsy_managed_secondary);