walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix xml output for invalid chars (#6431)

This commit is contained in:
Daniel Marjamäki 2016-02-01 18:53:46 +01:00
parent a288d5eb16
commit 39a5400b7d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/errorlogger.cpp
View File

@ -242,12 +242,7 @@ std::string ErrorLogger::ErrorMessage::fixInvalidChars(const std::string& raw)
std::ostringstream es; std::ostringstream es;
// straight cast to (unsigned) doesn't work out. // straight cast to (unsigned) doesn't work out.
const unsigned uFrom = (unsigned char)*from; const unsigned uFrom = (unsigned char)*from;
#if 0 es << '\\' << std::setbase(8) << std::setw(3) << std::setfill('0') << uFrom;
if (uFrom<0x20)
es << "\\XXX";
else
#endif
es << '\\' << std::setbase(8) << std::setw(3) << std::setfill('0') << uFrom;
result += es.str(); result += es.str();
} }
++from; ++from;
@ -271,7 +266,7 @@ std::string ErrorLogger::ErrorMessage::toXML(bool verbose, int version) const
} }
printer.PushAttribute("id", _id.c_str()); printer.PushAttribute("id", _id.c_str());
printer.PushAttribute("severity", (_severity == Severity::error ? "error" : "style")); printer.PushAttribute("severity", (_severity == Severity::error ? "error" : "style"));
printer.PushAttribute("msg", (verbose ? _verboseMessage : _shortMessage).c_str()); printer.PushAttribute("msg", fixInvalidChars(verbose ? _verboseMessage : _shortMessage).c_str());
printer.CloseElement(false); printer.CloseElement(false);
return printer.CStr(); return printer.CStr();
} }