AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from Dmitry-Me/moveVariableDeclaration 

Move variable declaration closer to where it's needed
This commit is contained in:
Lee Thomason 2014-12-23 13:12:38 -08:00
parent eaddfd8768 5b4a5169e3
commit ffee345723
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tinyxml2.cpp
View File

@ -1861,7 +1861,6 @@ XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
XMLError XMLDocument::Parse( const char* p, size_t len ) XMLError XMLDocument::Parse( const char* p, size_t len )
{ {
const char* start = p;
Clear(); Clear();
if ( len == 0 || !p || !*p ) { if ( len == 0 || !p || !*p ) {
@ -1875,6 +1874,7 @@ XMLError XMLDocument::Parse( const char* p, size_t len )
memcpy( _charBuffer, p, len ); memcpy( _charBuffer, p, len );
_charBuffer[len] = 0; _charBuffer[len] = 0;
const char* start = p;
p = XMLUtil::SkipWhiteSpace( p ); p = XMLUtil::SkipWhiteSpace( p );
p = XMLUtil::ReadBOM( p, &_writeBOM ); p = XMLUtil::ReadBOM( p, &_writeBOM );
if ( !p || !*p ) { if ( !p || !*p ) {

2
tinyxml2.h
View File

@ -562,10 +562,10 @@ public:
} }
inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) {
int n = 0;
if ( p == q ) { if ( p == q ) {
return true; return true;
} }
int n = 0;
while( *p && *q && *p == *q && n<nChar ) { while( *p && *q && *p == *q && n<nChar ) {
++p; ++p;
++q; ++q;