udev: preempt cancellation

[vlc] / modules / services_discovery / hal.c

diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c
index 884bf5ae1f72374f968e81896a2d60081cc6c91a..a8241bd85a5941ac9e23680e3673e42733b819f5 100644 (file)
--- a/modules/services_discovery/hal.c
+++ b/modules/services_discovery/hal.c
@@ -30,6 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_playlist.h>
+#include <vlc_services_discovery.h>
 
 #include <vlc_network.h>
 
@@ -79,15 +80,15 @@ services_discovery_t        *p_sd_global;
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( N_("HAL devices detection") );
-    set_category( CAT_PLAYLIST );
-    set_subcategory( SUBCAT_PLAYLIST_SD );
+vlc_module_begin ()
+    set_description( N_("HAL devices detection") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_SD )
 
-    set_capability( "services_discovery", 0 );
-    set_callbacks( Open, Close );
+    set_capability( "services_discovery", 0 )
+    set_callbacks( Open, Close )
 
-vlc_module_end();
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -102,7 +103,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_ENOMEM;
 
     DBusError           dbus_error;
-    DBusConnection      *p_connection;
+    DBusConnection      *p_connection = NULL;
 
     p_sd_global = p_sd;
     p_sys->i_devices_number = 0;
@@ -123,9 +124,7 @@ static int Open( vlc_object_t *p_this )
     if( dbus_error_is_set( &dbus_error ) )
     {
         msg_Err( p_sd, "unable to connect to DBUS: %s", dbus_error.message );
-        dbus_error_free( &dbus_error );
-        free( p_sys );
-        return VLC_EGENERIC;
+        goto error;
     }
     libhal_ctx_set_dbus_connection( p_sys->p_ctx, p_connection );
     p_sys->p_connection = p_connection;
@@ -145,11 +144,12 @@ static int Open( vlc_object_t *p_this )
     if( vlc_clone( &p_sys->thread, Run, p_this, VLC_THREAD_PRIORITY_LOW ) )
         goto error;
 
-    services_discovery_SetLocalizedName( p_sd, _("Devices") );
-
     return VLC_SUCCESS;
 error:
+    if( p_connection )
+        dbus_connection_unref( p_connection );
     dbus_error_free( &dbus_error );
+    libhal_ctx_free( p_sys->p_ctx );
     free( p_sys );
     return VLC_EGENERIC;
 }
@@ -178,6 +178,8 @@ static void Close( vlc_object_t *p_this )
     }
     p_sys->pp_devices = NULL;
 
+    libhal_ctx_free( p_sys->p_ctx );
+
     free( p_sys );
 }
 
@@ -316,6 +318,7 @@ static void *Run( void *data )
             ParseDevice( p_sd, devices[ i ] );
             libhal_free_string( devices[ i ] );
         }
+        free( devices );
     }
 
     /* FIXME: Totally lame. There are DBus watch functions to do this properly.