Merge pull request #894 from saran-t/master

Change argument names in tinyxml2.cpp to match those in tinyxml2.h.

1 files changed, 11 insertions, 11 deletions

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index d32b2b3..5eebf39 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -103,8 +103,8 @@ distribution.
 #if defined(_WIN64)

 	#define TIXML_FSEEK _fseeki64

 	#define TIXML_FTELL _ftelli64

-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) \
-	|| defined(__NetBSD__) || defined(__DragonFly__) || defined(__ANDROID__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) \

+	|| defined(__NetBSD__) || defined(__DragonFly__) || defined(__ANDROID__)

 	#define TIXML_FSEEK fseeko

 	#define TIXML_FTELL ftello

 #elif defined(__unix__) && defined(__x86_64__)

@@ -1777,11 +1777,11 @@ XMLError XMLElement::QueryInt64Text(int64_t* ival) const
 }

 

 

-XMLError XMLElement::QueryUnsigned64Text(uint64_t* ival) const

+XMLError XMLElement::QueryUnsigned64Text(uint64_t* uval) const

 {

     if(FirstChild() && FirstChild()->ToText()) {

         const char* t = FirstChild()->Value();

-        if(XMLUtil::ToUnsigned64(t, ival)) {

+        if(XMLUtil::ToUnsigned64(t, uval)) {

             return XML_SUCCESS;

         }

         return XML_CAN_NOT_CONVERT_TEXT;

@@ -2413,21 +2413,21 @@ XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
 }

 

 

-XMLError XMLDocument::Parse( const char* p, size_t len )

+XMLError XMLDocument::Parse( const char* xml, size_t nBytes )

 {

     Clear();

 

-    if ( len == 0 || !p || !*p ) {

+    if ( nBytes == 0 || !xml || !*xml ) {

         SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );

         return _errorID;

     }

-    if ( len == static_cast<size_t>(-1) ) {

-        len = strlen( p );

+    if ( nBytes == static_cast<size_t>(-1) ) {

+        nBytes = strlen( xml );

     }

     TIXMLASSERT( _charBuffer == 0 );

-    _charBuffer = new char[ len+1 ];

-    memcpy( _charBuffer, p, len );

-    _charBuffer[len] = 0;

+    _charBuffer = new char[ nBytes+1 ];

+    memcpy( _charBuffer, xml, nBytes );

+    _charBuffer[nBytes] = 0;

 

     Parse();

     if ( Error() ) {