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

Fix Cppcheck warnings and remove Travis suppressions

This commit is contained in:
Daniel Marjamäki 2016-10-29 15:50:08 +02:00
parent a860c4c231
commit faa32fd51d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis_suppressions
View File

@ -7,8 +7,6 @@ passedByValue:lib/symboldatabase.h
passedByValue:lib/library.h passedByValue:lib/library.h
knownConditionTrueFalse:lib/platform.cpp knownConditionTrueFalse:lib/platform.cpp
knownConditionTrueFalse:build/* knownConditionTrueFalse:build/*
useInitializationList:lib/errorlogger.cpp
useInitializationList:build/errorlogger.cpp
*:gui/test* *:gui/test*
*:test/test.cxx *:test/test.cxx

12
lib/errorlogger.cpp
View File

@ -111,16 +111,18 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack
setmsg(msg); setmsg(msg);
} }
ErrorLogger::ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg) : _cwe(0U) ErrorLogger::ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errmsg)
: _id(errmsg->Attribute("id")),
_severity(Severity::fromString(errmsg->Attribute("severity"))),
_cwe(0U),
_inconclusive(false),
_shortMessage(errmsg->Attribute("msg")),
_verboseMessage(errmsg->Attribute("verbose"))
{ {
_id = errmsg->Attribute("id");
_severity = Severity::fromString(errmsg->Attribute("severity"));
const char *attr = errmsg->Attribute("cwe"); const char *attr = errmsg->Attribute("cwe");
std::istringstream(attr ? attr : "0") >> _cwe.id; std::istringstream(attr ? attr : "0") >> _cwe.id;
attr = errmsg->Attribute("inconclusive"); attr = errmsg->Attribute("inconclusive");
_inconclusive = attr && (std::strcmp(attr, "true") == 0); _inconclusive = attr && (std::strcmp(attr, "true") == 0);
_shortMessage = errmsg->Attribute("msg");
_verboseMessage = errmsg->Attribute("verbose");
for (const tinyxml2::XMLElement *e = errmsg->FirstChildElement(); e; e = e->NextSiblingElement()) { for (const tinyxml2::XMLElement *e = errmsg->FirstChildElement(); e; e = e->NextSiblingElement()) {
if (std::strcmp(e->Name(),"location")==0) { if (std::strcmp(e->Name(),"location")==0) {
_callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(e->Attribute("file"), std::atoi(e->Attribute("line")))); _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(e->Attribute("file"), std::atoi(e->Attribute("line"))));