[patch] files/pmount-0.8-hal-api.patch

pmount-0.8-hal-api.patch (text/plain), 2.82 KB, created by Doug Goldstein (RETIRED) on 2005-05-08 22:34:59 UTC

diff -Nru pmount-0.8.old/pmount-hal.c pmount-0.8/pmount-hal.c
--- pmount-0.8.old/pmount-hal.c	2005-02-07 05:36:06.000000000 -0500
+++ pmount-0.8/pmount-hal.c	2005-05-08 23:33:04.000000000 -0400
@@ -164,33 +164,36 @@
     udi = argv[1];
 
     /* initialize hal connection */
-    hal_ctx = hal_initialize( NULL, FALSE );
+    hal_ctx = libhal_ctx_new ();
     if( !hal_ctx ) {
         fprintf( stderr, _("Error: could not connect to hal\n") );
         return 1;
     }
 
     /* get all interesting properties */
-    if( !hal_device_exists( hal_ctx, udi ) ) {
+    if( !libhal_device_exists( hal_ctx, udi, NULL ) ) {
         fprintf( stderr, _("Error: given UDI does not exist\n") );
+        libhal_ctx_free ( hal_ctx );
         return 1;
     }
 
-    if( hal_device_property_exists( hal_ctx, udi, "block.device" ) )
-        device = hal_device_get_property_string( hal_ctx, udi, "block.device" );
+    if( libhal_device_property_exists( hal_ctx, udi, "block.device", NULL ) )
+        device = libhal_device_get_property_string( hal_ctx, udi, "block.device", NULL );
     if( !device ) {
         fprintf( stderr, _("Error: given UDI is not a mountable volume\n") );
+        libhal_ctx_free ( hal_ctx );
         return 1;
     }
 
-    if( hal_device_property_exists( hal_ctx, udi, "volume.policy.desired_mount_point" ) )
-        label = hal_device_get_property_string( hal_ctx, udi, "volume.policy.desired_mount_point" );
-    if( hal_device_property_exists( hal_ctx, udi, "volume.fstype" ) )
-        fstype = hal_device_get_property_string( hal_ctx, udi, "volume.fstype" );
-    if( hal_device_property_exists( hal_ctx, udi, "volume.policy.mount_option.sync" ) )
-        sync = hal_device_get_property_bool( hal_ctx, udi, "volume.policy.mount_option.sync" );
-    if( hal_device_property_exists( hal_ctx, udi, "volume.policy.mount_option.noatime" ) )
-        noatime = hal_device_get_property_bool( hal_ctx, udi, "volume.policy.mount_option.noatime" );
+    if( libhal_device_property_exists( hal_ctx, udi, "volume.policy.desired_mount_point", NULL ) )
+        label = libhal_device_get_property_string( hal_ctx, udi, "volume.policy.desired_mount_point", NULL );
+    if( libhal_device_property_exists( hal_ctx, udi, "volume.fstype", NULL ) )
+        fstype = libhal_device_get_property_string( hal_ctx, udi, "volume.fstype", NULL );
+    if( libhal_device_property_exists( hal_ctx, udi, "volume.policy.mount_option.sync", NULL ) )
+        sync = libhal_device_get_property_bool( hal_ctx, udi, "volume.policy.mount_option.sync", NULL );
+    if( libhal_device_property_exists( hal_ctx, udi, "volume.policy.mount_option.noatime", NULL ) )
+        noatime = libhal_device_get_property_bool( hal_ctx, udi, "volume.policy.mount_option.noatime", NULL );
+    libhal_ctx_free ( hal_ctx );
 
     exec_pmount( device, fstype, label, sync, noatime, argc-2, argv+2 );