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

Improved fix for Cppcheck warning. Remove useless conditions instead of adding a new one.

This commit is contained in:
Daniel Marjamäki 2014-09-07 09:56:07 +02:00
parent 605fb9039a
commit 7142edf03e
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/executionpath.cpp
View File

@ -366,13 +366,13 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
} }
// ; { ... } // ; { ... }
if (tok && Token::Match(tok->previous(), "[;{}:] {")) { if (Token::Match(tok->previous(), "[;{}:] {")) {
ExecutionPath::checkScope(tok->next(), checks); ExecutionPath::checkScope(tok->next(), checks);
tok = tok->link(); tok = tok->link();
continue; continue;
} }
if (tok && tok->str() == "if" && tok->next() && tok->next()->str() == "(") { if (tok->str() == "if" && tok->next() && tok->next()->str() == "(") {
// what variable ids should the numberOfIf be counted for? // what variable ids should the numberOfIf be counted for?
std::set<unsigned int> countif; std::set<unsigned int> countif;
@ -449,15 +449,9 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
} }
} }
if (tok) {
tok = check->parse(*tok, checks); tok = check->parse(*tok, checks);
if (checks.empty()) if (!tok || checks.empty())
return; return;
}
if (!tok)
break;
// return/throw ends all execution paths // return/throw ends all execution paths
if (tok->str() == "return" || if (tok->str() == "return" ||