XML: simplify demuxers

[vlc] / modules / demux / playlist / b4s.c

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index d08814d96215e791eda153d2e582df8ddc4e46e6..0d550c4cafc27f0ff6e919e1d60085782c41cc71 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -37,7 +37,6 @@
 
 struct demux_sys_t
 {
-    char *psz_prefix;
 };
 
 /*****************************************************************************
@@ -54,7 +53,6 @@ int Import_B4S( vlc_object_t *p_this )
 {
     DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open",
                                       "using B4S playlist reader" );
-    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
     return VLC_SUCCESS;
 }
 
@@ -66,7 +64,6 @@ void Close_B4S( 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->psz_prefix );
     free( p_sys );
 }
 
@@ -74,7 +71,6 @@ static int Demux( demux_t *p_demux )
 {
     int i_ret = -1;
 
-    xml_t *p_xml;
     xml_reader_t *p_xml_reader = NULL;
     char *psz_elname = NULL;
     input_item_t *p_input;
@@ -84,15 +80,11 @@ static int Demux( demux_t *p_demux )
 
     input_item_t *p_current_input = GetCurrentItem(p_demux);
 
-    p_xml = xml_Create( p_demux );
-    if( !p_xml )
-        goto end;
-
     psz_elname = stream_ReadLine( p_demux->s );
     free( psz_elname );
     psz_elname = NULL;
 
-    p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
+    p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
     if( !p_xml_reader )
         goto end;
 
@@ -199,7 +191,7 @@ static int Demux( demux_t *p_demux )
                     }
                     else
                     {
-                        msg_Warn( p_demux, "unexpected attribure %s in element %s",
+                        msg_Warn( p_demux, "unexpected attribute %s in element %s",
                                   psz_name, psz_elname );
                         free( psz_value );
                     }
@@ -298,9 +290,7 @@ end:
 
     vlc_gc_decref( p_current_input );
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
-    if( p_xml )
-        xml_Delete( p_xml );
+        xml_ReaderDelete( p_xml_reader );
     return i_ret;
 }