[vlc-commits] access/dcp: merge declaration and initialization

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Tue Oct 11 20:06:14 2016 +0200| [003af74d4dbece9e6e89b3d1ecccdf73e6aa90d5] | committer: Thomas Guillem

access/dcp: merge declaration and initialization

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 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