commit 10b8ecc99b1f606a1e21afe832c0975ca58bd3fe
author Dmitry-Me <wipedout@yandex.ru> Wed Apr 12 17:57:44 2017 +0300
committer Dmitry-Me <wipedout@yandex.ru> Wed Apr 12 17:57:44 2017 +0300
tree cd2cc4984fd75d9dce48ed300f1eaa7164f46c9d
parent 2b0453f43ea086872b7835b0335a0c56e972ee08

Clarify variable names

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 0d6e2bc..152e3d2 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -955,7 +955,7 @@
 }

 

 

-char* XMLNode::ParseDeep( char* p, StrPair* parentEnd, int* curLineNumPtr )

+char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr )

 {

     // This is a recursive method, but thinking about it "at the current level"

     // it is a pretty simple flat list:

@@ -1020,8 +1020,8 @@
         if ( ele ) {

             // We read the end tag. Return it to the parent.

             if ( ele->ClosingType() == XMLElement::CLOSING ) {

-                if ( parentEnd ) {

-                    ele->_value.TransferTo( parentEnd );

+                if ( parentEndTag ) {

+                    ele->_value.TransferTo( parentEndTag );

                 }

                 node->_memPool->SetTracked();   // created and then immediately deleted.

                 DeleteNode( node );

@@ -1849,7 +1849,7 @@
 //	<ele></ele>

 //	<ele>foo<b>bar</b></ele>

 //

-char* XMLElement::ParseDeep( char* p, StrPair* strPair, int* curLineNumPtr )

+char* XMLElement::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr )

 {

     // Read the element name.

     p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr );

@@ -1872,7 +1872,7 @@
         return p;

     }

 

-    p = XMLNode::ParseDeep( p, strPair, curLineNumPtr );

+    p = XMLNode::ParseDeep( p, parentEndTag, curLineNumPtr );

     return p;

 }

 

tinyxml2.h

diff --git a/tinyxml2.h b/tinyxml2.h
index 17e576a..087b551 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -907,7 +907,7 @@
     XMLNode( XMLDocument* );

     virtual ~XMLNode();

 

-    virtual char* ParseDeep( char*, StrPair*, int* );

+    virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr);

 

     XMLDocument*	_document;

     XMLNode*		_parent;

@@ -975,7 +975,7 @@
     XMLText( XMLDocument* doc )	: XMLNode( doc ), _isCData( false )	{}

     virtual ~XMLText()												{}

 

-    char* ParseDeep( char*, StrPair* endTag, int* curLineNumPtr );

+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );

 

 private:

     bool _isCData;

@@ -1006,7 +1006,7 @@
     XMLComment( XMLDocument* doc );

     virtual ~XMLComment();

 

-    char* ParseDeep( char*, StrPair* endTag, int* curLineNumPtr);

+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr);

 

 private:

     XMLComment( const XMLComment& );	// not supported

@@ -1045,7 +1045,7 @@
     XMLDeclaration( XMLDocument* doc );

     virtual ~XMLDeclaration();

 

-    char* ParseDeep( char*, StrPair* endTag, int* curLineNumPtr );

+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );

 

 private:

     XMLDeclaration( const XMLDeclaration& );	// not supported

@@ -1080,7 +1080,7 @@
     XMLUnknown( XMLDocument* doc );

     virtual ~XMLUnknown();

 

-    char* ParseDeep( char*, StrPair* endTag, int* curLineNumPtr );

+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );

 

 private:

     XMLUnknown( const XMLUnknown& );	// not supported

@@ -1571,7 +1571,7 @@
     virtual bool ShallowEqual( const XMLNode* compare ) const;

 

 protected:

-    char* ParseDeep( char* p, StrPair* endTag, int* curLineNumPtr );

+    char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr );

 

 private:

     XMLElement( XMLDocument* doc );