Merge pull request #976 from leethomason/AlbertHungGarmin-format_error
Albert hung garmin format error
This commit is contained in:
@@ -2504,7 +2504,7 @@ void XMLDocument::ClearError() {
|
|||||||
|
|
||||||
void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... )
|
void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... )
|
||||||
{
|
{
|
||||||
TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT );
|
TIXMLASSERT(error >= 0 && error < XML_ERROR_COUNT);
|
||||||
_errorID = error;
|
_errorID = error;
|
||||||
_errorLineNum = lineNum;
|
_errorLineNum = lineNum;
|
||||||
_errorStr.Reset();
|
_errorStr.Reset();
|
||||||
@@ -2513,7 +2513,8 @@ void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ...
|
|||||||
char* buffer = new char[BUFFER_SIZE];
|
char* buffer = new char[BUFFER_SIZE];
|
||||||
|
|
||||||
TIXMLASSERT(sizeof(error) <= sizeof(int));
|
TIXMLASSERT(sizeof(error) <= sizeof(int));
|
||||||
TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum);
|
TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d",
|
||||||
|
ErrorIDToName(error), static_cast<int>(error), static_cast<unsigned int>(error), lineNum);
|
||||||
|
|
||||||
if (format) {
|
if (format) {
|
||||||
size_t len = strlen(buffer);
|
size_t len = strlen(buffer);
|
||||||
|
|||||||
Reference in New Issue
Block a user