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

tweaks, clarification to line numbers

Browse Source
This commit is contained in:
Lee Thomason
2016-12-24 07:34:39 -08:00
parent 002713856b
commit e90e901041
3 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tinyxml2.cpp
View File

@@ -193,6 +193,7 @@ char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLin
{
TIXMLASSERT( p );
TIXMLASSERT( endTag && *endTag );
TIXMLASSERT(curLineNumPtr);
char* start = p;
char endChar = *endTag;
@@ -238,8 +239,7 @@ void StrPair::CollapseWhitespace()
// Adjusting _start would cause undefined behavior on delete[]
TIXMLASSERT( ( _flags & NEEDS_DELETE ) == 0 );
// Trim leading space.
int unusedLineNum = 0;
_start = XMLUtil::SkipWhiteSpace( _start, &unusedLineNum );
_start = XMLUtil::SkipWhiteSpace( _start, 0 );
if ( *_start ) {
const char* p = _start; // the read pointer
@@ -247,7 +247,7 @@ void StrPair::CollapseWhitespace()
while( *p ) {
if ( XMLUtil::IsWhiteSpace( *p )) {
p = XMLUtil::SkipWhiteSpace( p, &unusedLineNum );
p = XMLUtil::SkipWhiteSpace( p, 0 );
if ( *p == 0 ) {
break; // don't write to q; this trims the trailing space.
}
@@ -2247,7 +2247,7 @@ void XMLDocument::SetError( XMLError error, const char* str1, const char* str2,
_errorStr2.SetStr(str2);
}
const char* XMLDocument::ErrorName(XMLError errorID)
/*static*/ const char* XMLDocument::ErrorIDToName(XMLError errorID)
{
TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT );
const char* errorName = _errorNames[errorID];
@@ -2257,7 +2257,7 @@ const char* XMLDocument::ErrorName(XMLError errorID)
const char* XMLDocument::ErrorName() const
{
return ErrorName(_errorID);
return ErrorIDToName(_errorID);
}
void XMLDocument::PrintError() const