[vlc-commits] DCP: remove unused XML validator

Rémi Denis-Courmont git at videolan.org
Thu Jul 2 20:12:50 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  2 20:53:05 2015 +0300| [3b1b0b7228043151c2c523fc9af43ac73a805715] | committer: Rémi Denis-Courmont

DCP: remove unused XML validator

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

 modules/access/dcp/dcpparser.cpp |   11 +----------
 modules/access/dcp/dcpparser.h   |    1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/access/dcp/dcpparser.cpp b/modules/access/dcp/dcpparser.cpp
index b37015c..2d3e4bd 100755
--- a/modules/access/dcp/dcpparser.cpp
+++ b/modules/access/dcp/dcpparser.cpp
@@ -723,22 +723,16 @@ int XmlFile::OpenXml()
 {
     char *psz_uri;
 
-    this->p_xml = xml_Create( this->p_demux );
-    if (! this->p_xml) {
-        return -1;
-    }
     psz_uri = vlc_path2uri( this->s_path.c_str(), "file" );
     this->p_stream = stream_UrlNew(this->p_demux, psz_uri );
     free(psz_uri);
     if( ! this->p_stream ) {
-        xml_Delete(this->p_xml );
         return -1;
     }
 
-    this->p_xmlReader = xml_ReaderCreate( this->p_xml, this->p_stream);
+    this->p_xmlReader = xml_ReaderCreate( this->p_demux, this->p_stream);
     if( ! this->p_xmlReader ) {
         stream_Delete( this->p_stream );
-        xml_Delete(this->p_xml );
         return -1;
     }
     return 0;
@@ -828,9 +822,6 @@ void XmlFile::CloseXml() {
         stream_Delete( this->p_stream );
     if( this->p_xmlReader )
         xml_ReaderDelete( this->p_xmlReader );
-    if( this->p_xml )
-        xml_Delete( this->p_xml );
-
 }
 
 /*
diff --git a/modules/access/dcp/dcpparser.h b/modules/access/dcp/dcpparser.h
index 5789d21..4626bb8 100644
--- a/modules/access/dcp/dcpparser.h
+++ b/modules/access/dcp/dcpparser.h
@@ -128,7 +128,6 @@ protected:
     string       s_path;
     stream_t     *p_stream;
 
-    xml_t        *p_xml;
     xml_reader_t *p_xmlReader;
 
     int OpenXml();



More information about the vlc-commits mailing list