potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #894 from saran-t/master

Browse Source 
Change argument names in tinyxml2.cpp to match those in tinyxml2.h.
This commit is contained in:
Lee Thomason
2022-04-02 13:59:56 -07:00
committed by GitHub
parent 435c0a1199 4cc4145d7f
commit a1ea80ba74
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tinyxml2.cpp
View File

@@ -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()) { if(FirstChild() && FirstChild()->ToText()) {
const char* t = FirstChild()->Value(); const char* t = FirstChild()->Value();
if(XMLUtil::ToUnsigned64(t, ival)) { if(XMLUtil::ToUnsigned64(t, uval)) {
return XML_SUCCESS; return XML_SUCCESS;
} }
return XML_CAN_NOT_CONVERT_TEXT; 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(); Clear();
if ( len == 0 || !p || !*p ) { if ( nBytes == 0 || !xml || !*xml ) {
SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
return _errorID; return _errorID;
} }
if ( len == static_cast<size_t>(-1) ) { if ( nBytes == static_cast<size_t>(-1) ) {
len = strlen( p ); nBytes = strlen( xml );
} }
TIXMLASSERT( _charBuffer == 0 ); TIXMLASSERT( _charBuffer == 0 );
_charBuffer = new char[ len+1 ]; _charBuffer = new char[ nBytes+1 ];
memcpy( _charBuffer, p, len ); memcpy( _charBuffer, xml, nBytes );
_charBuffer[len] = 0; _charBuffer[nBytes] = 0;
Parse(); Parse();
if ( Error() ) { if ( Error() ) {