[vlc-commits] skins2: cleanup and remove a now highly dubious useDTD parameter

[Erwan Tulou]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Sun Jan 23 15:19:22 2011 +0100| [41482dcce6d9bccbe5e38666d2db7315ece53e9f] | committer: Erwan Tulou

skins2: cleanup and remove a now highly dubious useDTD parameter

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=41482dcce6d9bccbe5e38666d2db7315ece53e9f
---

 modules/gui/skins2/parser/skin_parser.cpp |   10 +++-----
 modules/gui/skins2/parser/skin_parser.hpp |    3 +-
 modules/gui/skins2/parser/xmlparser.cpp   |   30 ++++++++++------------------
 modules/gui/skins2/parser/xmlparser.hpp   |    3 +-
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index 7be0cd9..c699778 100644
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -27,9 +27,9 @@
 #include <math.h>
 
 SkinParser::SkinParser( intf_thread_t *pIntf, const string &rFileName,
-                        const string &rPath, bool useDTD, BuilderData *pData ):
-    XMLParser( pIntf, rFileName, useDTD ), m_path( rPath), m_pData(pData),
-    m_ownData(pData == NULL), m_xOffset( 0 ), m_yOffset( 0 )
+                        const string &rPath, BuilderData *pData ):
+    XMLParser( pIntf, rFileName ), m_path( rPath ), m_pData( pData ),
+    m_ownData( pData == NULL ), m_xOffset( 0 ), m_yOffset( 0 )
 {
     // Make sure the data is allocated
     if( m_pData == NULL )
@@ -76,9 +76,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         OSFactory *pFactory = OSFactory::instance( getIntf() );
         string fullPath = m_path + pFactory->getDirSeparator() + attr["file"];
         msg_Dbg( getIntf(), "opening included XML file: %s", fullPath.c_str() );
-        // FIXME: We do not use the DTD to validate the included XML file,
-        // as the parser seems to dislike it otherwise...
-        SkinParser subParser( getIntf(), fullPath.c_str(), m_path, false, m_pData );
+        SkinParser subParser( getIntf(), fullPath.c_str(), m_path, m_pData );
         subParser.parse();
     }
 
diff --git a/modules/gui/skins2/parser/skin_parser.hpp b/modules/gui/skins2/parser/skin_parser.hpp
index f63954b..77e6ba2 100644
--- a/modules/gui/skins2/parser/skin_parser.hpp
+++ b/modules/gui/skins2/parser/skin_parser.hpp
@@ -44,8 +44,7 @@ public:
     };
 
     SkinParser( intf_thread_t *pIntf, const string &rFileName,
-                const string &rPath, bool useDTD = true,
-                BuilderData *pData = NULL );
+                const string &rPath, BuilderData *pData = NULL );
     virtual ~SkinParser();
 
     const BuilderData &getData() const { return *m_pData; }
diff --git a/modules/gui/skins2/parser/xmlparser.cpp b/modules/gui/skins2/parser/xmlparser.cpp
index 6f92917..f660e28 100644
--- a/modules/gui/skins2/parser/xmlparser.cpp
+++ b/modules/gui/skins2/parser/xmlparser.cpp
@@ -29,35 +29,28 @@
 #   include <sys/stat.h>
 #endif
 
-XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName,
-                      bool useDTD ):
-    SkinObject( pIntf )
+XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName )
+    : SkinObject( pIntf ), m_pXML( NULL ), m_pReader( NULL ), m_pStream( NULL )
 {
-    m_pReader = NULL;
-    m_pStream = NULL;
-
-    if( useDTD )
+    m_pXML = xml_Create( pIntf );
+    if( !m_pXML )
     {
-        m_pXML = xml_Create( pIntf );
-        if( m_pXML )
-            LoadCatalog();
-        else
-            msg_Err( getIntf(), "DTD not supported" );
+        msg_Err( getIntf(), "cannot initialize xml" );
+        return;
     }
-    else
-        m_pXML = NULL;
+
+    LoadCatalog();
 
     char* psz_uri = make_URI( rFileName.c_str(), NULL );
     m_pStream = stream_UrlNew( pIntf, psz_uri );
     free( psz_uri );
-
     if( !m_pStream )
     {
         msg_Err( getIntf(), "failed to open %s for reading",
                  rFileName.c_str() );
-        m_pReader = NULL;
         return;
     }
+
     m_pReader = xml_ReaderCreate( m_pXML, m_pStream );
     if( !m_pReader )
     {
@@ -66,8 +59,7 @@ XMLParser::XMLParser( intf_thread_t *pIntf, const string &rFileName,
         return;
     }
 
-    if( m_pXML )
-        xml_ReaderUseDTD( m_pReader );
+    xml_ReaderUseDTD( m_pReader );
 }
 
 
@@ -105,7 +97,7 @@ void XMLParser::LoadCatalog()
     if( it == resPath.end() )
     {
         // Ok, try the default one
-        xml_CatalogLoad( m_pXML, 0 );
+        xml_CatalogLoad( m_pXML, NULL );
     }
 
     for( it = resPath.begin(); it != resPath.end(); ++it )
diff --git a/modules/gui/skins2/parser/xmlparser.hpp b/modules/gui/skins2/parser/xmlparser.hpp
index aa5f9e2..4645bd7 100644
--- a/modules/gui/skins2/parser/xmlparser.hpp
+++ b/modules/gui/skins2/parser/xmlparser.hpp
@@ -37,8 +37,7 @@
 class XMLParser: public SkinObject
 {
 public:
-    XMLParser( intf_thread_t *pIntf, const string &rFileName,
-               bool useDTD = true );
+    XMLParser( intf_thread_t *pIntf, const string &rFileName );
     virtual ~XMLParser();
 
     /// Parse the file. Returns true on success