playlist: remove dead code and malloc(0)

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 099cc5e08f4a2bac6eff1628ef9baab1158b4063..6f6e6668a1812ff98488bc492514b7ec2e53c25e 100644 (file)
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -41,10 +41,6 @@
 
 #include "playlist.h"
 
-struct demux_sys_t
-{
-};
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -158,23 +154,14 @@ int Import_ASX( vlc_object_t *p_this )
         ) ||
         demux_IsForced( p_demux, "asx-open" ) )
     {
-        STANDARD_DEMUX_INIT_MSG( "found valid ASX playlist" );
-        return VLC_SUCCESS;
+        msg_Dbg( p_demux, "found valid ASX playlist" );
     }
     else
         return VLC_EGENERIC;
-}
-
-/*****************************************************************************
- * Deactivate: frees unused data
- *****************************************************************************/
-
-void Close_ASX( vlc_object_t *p_this )
-{
-    demux_t *p_demux = (demux_t *)p_this;
-    demux_sys_t *p_sys = p_demux->p_sys;
 
-    free( p_sys );
+    p_demux->pf_control = Control;
+    p_demux->pf_demux = Demux;
+    return VLC_SUCCESS;
 }
 
 static void ProcessEntry( int *pi_n_entry, xml_reader_t *p_xml_reader,

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 4b25dd36796b056622c343227e5c986e26b6f5c1..f50d8b5d12d55404575b25c64112dbbbd33d1ea0 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -109,7 +109,7 @@ vlc_module_begin ()
         set_description( N_("ASX playlist import") )
         add_shortcut( "playlist", "asx-open" )
         set_capability( "demux", 10 )
-        set_callbacks( Import_ASX, Close_ASX )
+        set_callbacks( Import_ASX, NULL )
     add_submodule ()
         set_description( N_("Kasenna MediaBase parser") )
         add_shortcut( "playlist", "sgimb" )

diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index c1230cf1c47ce37b3cffd5f8ffd24e951775240c..052e7c577c4c81024bc7a3ceed36e4db12ae1ce7 100644 (file)
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -53,7 +53,6 @@ void Close_xspf ( vlc_object_t * );
 int Import_Shoutcast ( vlc_object_t * );
 
 int Import_ASX ( vlc_object_t * );
-void Close_ASX ( vlc_object_t * );
 
 int Import_SGIMB ( vlc_object_t * );
 void Close_SGIMB ( vlc_object_t * );