xml_ReaderDelete: remove useless parameter

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 51850c3bfb3e261d757e0c059f8811314c9e9040..378ef55ce5a323466fe640af0e8f2f75a360e853 100644 (file)
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -55,7 +55,7 @@ VLC_EXPORT( xml_t *, xml_Create, ( vlc_object_t * ) LIBVLC_USED );
 VLC_EXPORT( void, xml_Delete, ( xml_t * ) );
 
 #define xml_ReaderCreate( a, b ) a->pf_reader_create( a, b )
-#define xml_ReaderDelete( a, b ) a->pf_reader_delete( b )
+#define xml_ReaderDelete( a ) a->p_xml->pf_reader_delete( a )
 #define xml_CatalogLoad( a, b ) a->pf_catalog_load( a, b )
 #define xml_CatalogAdd( a, b, c, d ) a->pf_catalog_add( a, b, c, d )
 

diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c
index 1af2ae7692a1e80aa9c9133c4636e542f8f5a193..02762c817981169197ddb2cf7068b812c78d0038 100644 (file)
--- a/modules/codec/subtitles/subsusf.c
+++ b/modules/codec/subtitles/subsusf.c
@@ -1016,7 +1016,7 @@ static void ParseUSFHeader( decoder_t *p_dec )
                 free( psz_node );
             }
 
-            xml_ReaderDelete( p_xml, p_xml_reader );
+            xml_ReaderDelete( p_xml_reader );
         }
         xml_Delete( p_xml );
     }

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 9558c63a53638883035f3f3eee6fe33618c34cae..5ddc35e642cabe864755b80d4e6b645328bfa653 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -295,7 +295,7 @@ end:
 
     vlc_gc_decref( p_current_input );
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
     return i_ret;

diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c
index 8c1750f71b00176293751d4c1d14c0c789527d5c..fc2fc00a1975de416c9383cffe44059df8a21be2 100644 (file)
--- a/modules/demux/playlist/itml.c
+++ b/modules/demux/playlist/itml.c
@@ -113,7 +113,7 @@ int Demux( demux_t *p_demux )
 end:
     free( psz_name );
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
 

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index df6736e1ea498417079bb562dded31363611c4ca..93f26532188360fa1acdb7ab4fd894a28e8b8fcc 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -365,7 +365,7 @@ static int Demux( demux_t *p_demux )
 
     free( psz_art_url );
     free( psz_elname );
-    xml_ReaderDelete( p_xml, p_xml_reader );
+    xml_ReaderDelete( p_xml_reader );
     xml_Delete( p_xml );
 
     input_item_node_PostAndDelete( p_subitems );
@@ -388,7 +388,7 @@ error:
     free( psz_elname );
 
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
     if( p_subitems )

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index d10d4f5f23c8e5dad7384ab72e9317b98baf1132..b3f4d733ff6a753162dd040bbcf9606642d3d6bd 100644 (file)
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -325,7 +325,7 @@ static int Demux( demux_t *p_demux )
 
 error:
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
 

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 14891d11467189b8e6fbcd1fbd452de81b8b7a5c..2534c7c2daf30b246c89c2a7f7ca3b1823ca99b0 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -134,7 +134,7 @@ static int Demux( demux_t *p_demux )
 
 error:
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
     free( psz_eltname );

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 27bef7042de7777ec599108b3634617f5afbcf74..7f1d7414364ebb0cac1bb4b8b38e9419a74680e2 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -138,7 +138,7 @@ int Demux( demux_t *p_demux )
 end:
     vlc_gc_decref(p_current_input);
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
     return i_ret; /* Needed for correct operation of go back */

diff --git a/modules/gui/skins2/parser/xmlparser.cpp b/modules/gui/skins2/parser/xmlparser.cpp
index e2f1e8bc361c5b881bd44ef4cff7af27031df6c9..f45dc0ffd00272d2181ef7bded84a2515bb7a020 100644 (file)
--- a/modules/gui/skins2/parser/xmlparser.cpp
+++ b/modules/gui/skins2/parser/xmlparser.cpp
@@ -79,7 +79,7 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName,
 
 XMLParser::~XMLParser()
 {
-    if( m_pReader && m_pXML ) xml_ReaderDelete( m_pXML, m_pReader );
+    if( m_pReader ) xml_ReaderDelete( m_pReader );
     if( m_pXML ) xml_Delete( m_pXML );
     if( m_pStream ) stream_Delete( m_pStream );
 }

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index d267a0d2239ed8ab0c2894590de0aaa3ba2c201e..abd5df79e9cdb35efbbcf54f285f0b24018ce916 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -2233,7 +2233,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
                     {
                         /* Only text and karaoke tags are supported */
                         msg_Dbg( p_filter, "Unsupported top-level tag '%s' ignored.", psz_node );
-                        xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
+                        xml_ReaderDelete( p_xml_reader );
                         p_xml_reader = NULL;
                         rv = VLC_EGENERIC;
                     }
@@ -2304,7 +2304,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
                 }
                 FreeLines( p_lines );
 
-                xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
+                xml_ReaderDelete( p_xml_reader );
             }
         }
         stream_Delete( p_sub );

diff --git a/modules/misc/lua/libs/xml.c b/modules/misc/lua/libs/xml.c
index cd655613e16f05747ac484ddf68b0a238f40462b..83f590e5915d4896a65700fbf4bdcd185998a362 100644 (file)
--- a/modules/misc/lua/libs/xml.c
+++ b/modules/misc/lua/libs/xml.c
@@ -125,7 +125,7 @@ static const luaL_Reg vlclua_xml_reader_reg[] = {
 static int vlclua_xml_reader_delete( lua_State *L )
 {
     xml_reader_t *p_reader = *(xml_reader_t**)luaL_checkudata( L, 1, "xml_reader" );
-    xml_ReaderDelete( p_reader->p_xml, p_reader );
+    xml_ReaderDelete( p_reader );
     return 0;
 }
 

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index 4b5294fa5f96a9fdb50058e5580ae9aadd05af8b..b7c4da2374319a92eb18c879b30b995c606c96a1 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -827,7 +827,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
                     else
                     {
                         /* Only text and karaoke tags are supported */
-                        xml_ReaderDelete( p_xml, p_xml_reader );
+                        xml_ReaderDelete( p_xml_reader );
                         p_xml_reader = NULL;
                         rv = VLC_EGENERIC;
                     }
@@ -855,7 +855,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out,
                 }
                 CFRelease(p_attrString);
 
-                xml_ReaderDelete( p_xml, p_xml_reader );
+                xml_ReaderDelete( p_xml_reader );
             }
             xml_Delete( p_xml );
         }

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index fe0c96e2443ed7b967b1f8ca87087fa62d421ca9..a9ff0c2126879678a8e3ccaa1be977beda758760 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -967,7 +967,7 @@ static rss_feed_t* FetchRSS( filter_t *p_filter )
         }
 
         msg_Dbg( p_filter, "done with %s RSS/Atom feed", p_feed->psz_url );
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
         stream_Delete( p_stream );
     }
 
@@ -977,7 +977,7 @@ static rss_feed_t* FetchRSS( filter_t *p_filter )
 error:
     FreeRSS( p_feeds, i_feed + 1 );
     if( p_xml_reader )
-        xml_ReaderDelete( p_xml, p_xml_reader );
+        xml_ReaderDelete( p_xml_reader );
     if( p_stream )
         stream_Delete( p_stream );
     if( p_xml )