Merge pull request #502 from Dmitry-Me/reuseClearError
Reuse code for error clearing
diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 941bd37..96f3ad7 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1960,9 +1960,7 @@
#ifdef DEBUG
const bool hadError = Error();
#endif
- _errorID = XML_SUCCESS;
- _errorStr1.Reset();
- _errorStr2.Reset();
+ ClearError();
delete [] _charBuffer;
_charBuffer = 0;
@@ -2167,7 +2165,7 @@
{
// Clear any error from the last save, otherwise it will get reported
// for *this* call.
- SetError(XML_SUCCESS, 0, 0);
+ ClearError();
XMLPrinter stream( fp, compact );
Print( &stream );
return _errorID;
diff --git a/tinyxml2.h b/tinyxml2.h
index bee739e..0cb1347 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -1741,6 +1741,10 @@
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.
bool Error() const {
return _errorID != XML_SUCCESS;