[vlc-commits] commit: xml_ReaderDelete: remove useless parameter ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Tue Jul 27 21:33:58 CEST 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jul 27 21:05:36 2010 +0300| [9d016759c25f227281fb0af9a4ea82bf38328b6d] | committer: Rémi Denis-Courmont
xml_ReaderDelete: remove useless parameter
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d016759c25f227281fb0af9a4ea82bf38328b6d
---
include/vlc_xml.h | 2 +-
modules/codec/subtitles/subsusf.c | 2 +-
modules/demux/playlist/b4s.c | 2 +-
modules/demux/playlist/itml.c | 2 +-
modules/demux/playlist/podcast.c | 4 ++--
modules/demux/playlist/qtl.c | 2 +-
modules/demux/playlist/shoutcast.c | 2 +-
modules/demux/playlist/xspf.c | 2 +-
modules/gui/skins2/parser/xmlparser.cpp | 2 +-
modules/misc/freetype.c | 4 ++--
modules/misc/lua/libs/xml.c | 2 +-
modules/misc/quartztext.c | 4 ++--
modules/video_filter/rss.c | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 51850c3..378ef55 100644
--- 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 1af2ae7..02762c8 100644
--- 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 9558c63..5ddc35e 100644
--- 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 8c1750f..fc2fc00 100644
--- 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 df6736e..93f2653 100644
--- 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 d10d4f5..b3f4d73 100644
--- 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 14891d1..2534c7c 100644
--- 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 27bef70..7f1d741 100644
--- 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 e2f1e8b..f45dc0f 100644
--- 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 d267a0d..abd5df7 100644
--- 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 cd65561..83f590e 100644
--- 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 4b5294f..b7c4da2 100644
--- 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 fe0c96e..a9ff0c2 100644
--- 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 )
More information about the vlc-commits
mailing list