AxioDL/tinyxml2
2
0
Fork 0
mirror of https://github.com/AxioDL/tinyxml2.git synced 2025-05-16 04:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

CodeReview Fix: initialLineNum? Something a little more descriptive?

Browse Source
This commit is contained in:
kezenator 2016-11-29 19:49:07 +10:00
parent e3d44159e3
commit e353181a46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tinyxml2.cpp
View File

@ -982,14 +982,14 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd, int* curLineNumPtr )
break; break;
} }
int nodeLineNum = node->_parseLineNum; int initialLineNum = node->_parseLineNum;
StrPair endTag; StrPair endTag;
p = node->ParseDeep( p, &endTag, curLineNumPtr ); p = node->ParseDeep( p, &endTag, curLineNumPtr );
if ( !p ) { if ( !p ) {
DeleteNode( node ); DeleteNode( node );
if ( !_document->Error() ) { if ( !_document->Error() ) {
_document->SetError( XML_ERROR_PARSING, 0, 0, nodeLineNum ); _document->SetError( XML_ERROR_PARSING, 0, 0, initialLineNum);
} }
break; break;
} }
@ -1009,7 +1009,7 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd, int* curLineNumPtr )
} }
} }
if ( !wellLocated ) { if ( !wellLocated ) {
_document->SetError( XML_ERROR_PARSING_DECLARATION, decl->Value(), 0, nodeLineNum ); _document->SetError( XML_ERROR_PARSING_DECLARATION, decl->Value(), 0, initialLineNum);
DeleteNode( node ); DeleteNode( node );
break; break;
} }
@ -1044,7 +1044,7 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd, int* curLineNumPtr )
} }
} }
if ( mismatch ) { if ( mismatch ) {
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, ele->Name(), 0, nodeLineNum ); _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, ele->Name(), 0, initialLineNum);
DeleteNode( node ); DeleteNode( node );
break; break;
} }