From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 5 Aug 2010 15:58:25 +0000 (+0300)
Subject: xtag: don't pretend to support DTD and catalogs
X-Git-Tag: 1.2.0-pre1~5546
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f37d226983f37e6cabd11176d8a9d4dbfb528f55;p=vlc

xtag: don't pretend to support DTD and catalogs
---

diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index cb2936b4f1..955037cb5e 100644
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -83,17 +83,11 @@ typedef struct _XTagParser
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
 static int ReaderOpen( vlc_object_t * );
 static void ReaderClose( vlc_object_t * );
 
 vlc_module_begin ()
     set_description( N_("Simple XML Parser") )
-    set_capability( "xml", 5 )
-    set_callbacks( Open, Close )
-
-    add_submodule()
     set_capability( "xml reader", 5 )
     set_callbacks( ReaderOpen, ReaderClose )
 vlc_module_end ()
@@ -114,9 +108,6 @@ static int ReaderNextAttr( xml_reader_t * );
 
 static int ReaderUseDTD ( xml_reader_t *, bool );
 
-static void CatalogLoad( xml_t *, const char * );
-static void CatalogAdd( xml_t *, const char *, const char *, const char * );
-
 static XTag *xtag_new_parse( const char *, int );
 static char *xtag_get_name( XTag * );
 #if 0
@@ -130,44 +121,6 @@ static void  xtag_free( XTag * );
 static int xtag_snprint( char *, int, XTag * );
 #endif
 
-/*****************************************************************************
- * Module initialization
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
-{
-    xml_t *p_xml = (xml_t *)p_this;
-
-    p_xml->pf_catalog_load = CatalogLoad;
-    p_xml->pf_catalog_add  = CatalogAdd;
-
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Module deinitialization
- *****************************************************************************/
-static void Close( vlc_object_t *p_this )
-{
-    VLC_UNUSED(p_this);
-    return;
-}
-
-/*****************************************************************************
- * Catalogue functions
- *****************************************************************************/
-static void CatalogLoad( xml_t *p_xml, const char *psz_filename )
-{
-    VLC_UNUSED(psz_filename);
-    msg_Dbg( p_xml, "catalog support not implemented" );
-}
-
-static void CatalogAdd( xml_t *p_xml, const char *psz_arg1,
-                          const char *psz_arg2, const char *psz_filename )
-{
-    VLC_UNUSED(p_xml); VLC_UNUSED(psz_arg1); VLC_UNUSED(psz_arg2);
-    VLC_UNUSED(psz_filename);
-}
-
 /*****************************************************************************
  * Reader functions
  *****************************************************************************/