Commit 9d016759 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

xml_ReaderDelete: remove useless parameter

parent 59117b28
......@@ -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 )
......
......@@ -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 );
}
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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 )
......
......@@ -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 );
......
......@@ -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 );
......
......@@ -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 */
......
......@@ -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 );
}
......
......@@ -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 );
......
......@@ -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;
}
......
......@@ -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 );
}
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment