playlist_Export simplifications

 - use automatic structure instead of heap
 - retain the playlist lock only while needed

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 2fc19c04a7b03bab00ece887ee71dd346b0a1274..5be97674055235d5f9d3a927da9d66c7e0af3e2b 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -40,7 +40,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
                      playlist_item_t *p_export_root,const char *psz_type )
 {
     module_t *p_module;
-    playlist_export_t *p_export;
+    playlist_export_t export;
 
     if( p_export_root == NULL ) return VLC_EGENERIC;
 
@@ -48,48 +48,35 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
                     p_export_root->p_input->psz_name, psz_filename );
 
     /* Prepare the playlist_export_t structure */
-    p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) );
-    if( !p_export)
-        return VLC_ENOMEM;
-    p_export->psz_filename = psz_filename ? strdup( psz_filename ) : NULL;
-    p_export->p_file = utf8_fopen( psz_filename, "wt" );
-    if( !p_export->p_file )
+    export.psz_filename = psz_filename ? strdup( psz_filename ) : NULL;
+    export.p_file = utf8_fopen( psz_filename, "wt" );
+    if( export.p_file == NULL )
     {
         msg_Err( p_playlist , "could not create playlist file %s (%m)",
                  psz_filename );
-        free( p_export->psz_filename );
-        free( p_export );
+        free( export.psz_filename );
         return VLC_EGENERIC;
     }
 
-    p_export->p_root = p_export_root;
+    export.p_root = p_export_root;
 
-    /* Lock the playlist */
-    vlc_object_lock( p_playlist );
-    p_playlist->p_private = (void *)p_export;
+    playlist_Lock( p_playlist );
+    p_playlist->p_private = (void *)&export;
 
     /* And call the module ! All work is done now */
-    int i_ret;
     p_module = module_need( p_playlist, "playlist export", psz_type, true);
     if( !p_module )
-    {
         msg_Warn( p_playlist, "exporting playlist failed" );
-        i_ret = VLC_ENOOBJ;
-    }
     else
-    {
         module_unneed( p_playlist , p_module );
-        i_ret = VLC_SUCCESS;
-    }
+    p_playlist->p_private = NULL;
+    playlist_Unlock( p_playlist );
 
     /* Clean up */
-    fclose( p_export->p_file );
-    free( p_export->psz_filename );
-    free( p_export );
-    p_playlist->p_private = NULL;
-    vlc_object_unlock( p_playlist );
+    fclose( export.p_file );
+    free( export.psz_filename );
 
-    return i_ret;
+    return p_module ? VLC_SUCCESS : VLC_ENOOBJ;
 }
 
 int playlist_Import( playlist_t *p_playlist, const char *psz_file )