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

Merge pull request #243 from JayXon/simplify_node_logic 

Simplify node logic
This commit is contained in:
Lee Thomason 2014-12-22 11:22:47 -08:00
parent ebb0c8f904 dbfdd8fdd5
commit 0b4bdd2a47
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tinyxml2.cpp
View File

@ -855,7 +855,6 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
p = node->ParseDeep( p, &endTag ); p = node->ParseDeep( p, &endTag );
if ( !p ) { if ( !p ) {
DeleteNode( node ); DeleteNode( node );
node = 0;
if ( !_document->Error() ) { if ( !_document->Error() ) {
_document->SetError( XML_ERROR_PARSING, 0, 0 ); _document->SetError( XML_ERROR_PARSING, 0, 0 );
} }
@ -890,16 +889,11 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
} }
if ( mismatch ) { if ( mismatch ) {
_document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 ); _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
p = 0; DeleteNode( node );
break;
} }
} }
if ( p == 0 ) { InsertEndChild( node );
DeleteNode( node );
node = 0;
}
if ( node ) {
this->InsertEndChild( node );
}
} }
return 0; return 0;
} }