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 )
free( psz_node );
}
- xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_ReaderDelete( p_xml_reader );
}
xml_Delete( p_xml );
}
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;
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 );
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 );
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 )
error:
if( p_xml_reader )
- xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_ReaderDelete( p_xml_reader );
if( p_xml )
xml_Delete( p_xml );
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 );
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 */
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 );
}
{
/* 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;
}
}
FreeLines( p_lines );
- xml_ReaderDelete( p_filter->p_sys->p_xml, p_xml_reader );
+ xml_ReaderDelete( p_xml_reader );
}
}
stream_Delete( p_sub );
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;
}
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;
}
}
CFRelease(p_attrString);
- xml_ReaderDelete( p_xml, p_xml_reader );
+ xml_ReaderDelete( p_xml_reader );
}
xml_Delete( p_xml );
}
}
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 );
}
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 )