[vlc-devel] [PATCH 02/13] access/dcp: merge declaration and initialization
Filip Roséen
filip at atch.se
Tue Oct 11 20:06:14 CEST 2016
---
modules/access/dcp/dcpparser.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/access/dcp/dcpparser.cpp b/modules/access/dcp/dcpparser.cpp
index 68f4f5e..4a6f554 100755
--- a/modules/access/dcp/dcpparser.cpp
+++ b/modules/access/dcp/dcpparser.cpp
@@ -740,16 +740,13 @@ int XmlFile::OpenXml()
int XmlFile::ReadNextNode( demux_t *p_demux, xml_reader_t *p_xmlReader, string& p_node )
{
- string s_node;
const char * c_node;
- int i;
- size_t ui_pos;
-
- i = xml_ReaderNextNode( p_xmlReader, &c_node );
+ int i = xml_ReaderNextNode( p_xmlReader, &c_node );
/* remove namespaces, if there are any */
- s_node = c_node;
- ui_pos = s_node.find( ":" );
+ string s_node = c_node;
+ size_t ui_pos = s_node.find( ":" );
+
if( ( i == XML_READER_STARTELEM || i == XML_READER_ENDELEM ) && ( ui_pos != string::npos ) )
{
try
--
2.10.0
More information about the vlc-devel
mailing list