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

Merge pull request #502 from Dmitry-Me/reuseClearError 

Reuse code for error clearing
This commit is contained in:
Lee Thomason 2016-11-25 22:06:11 -08:00 committed by GitHub
parent 5bbb6fb052 0d2cef0cba
commit 156bc1b99f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tinyxml2.cpp
View File

@ -1960,9 +1960,7 @@ void XMLDocument::Clear()
#ifdef DEBUG #ifdef DEBUG
const bool hadError = Error(); const bool hadError = Error();
#endif #endif
_errorID = XML_SUCCESS; ClearError();
_errorStr1.Reset();
_errorStr2.Reset();
delete [] _charBuffer; delete [] _charBuffer;
_charBuffer = 0; _charBuffer = 0;
@ -2167,7 +2165,7 @@ XMLError XMLDocument::SaveFile( FILE* fp, bool compact )
{ {
// Clear any error from the last save, otherwise it will get reported // Clear any error from the last save, otherwise it will get reported
// for *this* call. // for *this* call.
SetError(XML_SUCCESS, 0, 0); ClearError();
XMLPrinter stream( fp, compact ); XMLPrinter stream( fp, compact );
Print( &stream ); Print( &stream );
return _errorID; return _errorID;

4
tinyxml2.h
View File

@ -1741,6 +1741,10 @@ public:
void SetError( XMLError error, const char* str1, const char* str2 ); void SetError( XMLError error, const char* str1, const char* str2 );
void ClearError() {
SetError(XML_SUCCESS, 0, 0);
}
/// Return true if there was an error parsing the document. /// Return true if there was an error parsing the document.
bool Error() const { bool Error() const {
return _errorID != XML_SUCCESS; return _errorID != XML_SUCCESS;