Error string re-work
diff --git a/tinyxml2.h b/tinyxml2.h
index 7b5bb0e..ecab407 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -1785,10 +1785,10 @@
*/
void DeleteNode( XMLNode* node );
- void SetError( XMLError error, const char* str1, const char* str2, int lineNum );
+ void SetError( XMLError error, int lineNum, const char* format, ... );
void ClearError() {
- SetError(XML_SUCCESS, 0, 0, 0);
+ SetError(XML_SUCCESS, 0, 0);
}
/// Return true if there was an error parsing the document.
@@ -1803,10 +1803,7 @@
static const char* ErrorIDToName(XMLError errorID);
/// Return a possibly helpful diagnostic location or string.
- const char* GetErrorStr1() const;
-
- /// Return a possibly helpful secondary diagnostic location or string.
- const char* GetErrorStr2() const;
+ const char* GetErrorStr() const;
/// Return the line where the error occured, or zero if unknown.
int GetErrorLineNum() const
@@ -1849,8 +1846,7 @@
bool _processEntities;
XMLError _errorID;
Whitespace _whitespaceMode;
- mutable StrPair _errorStr1;
- mutable StrPair _errorStr2;
+ mutable StrPair _errorStr;
int _errorLineNum;
char* _charBuffer;
int _parseCurLineNum;