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

early break in loop for readability

This commit is contained in:
Dmitry-Me 2015-02-13 16:36:20 +01:00 committed by Daniel Marjamäki
parent 7961bba0da
commit 5674b3c49d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/checkother.cpp
View File

@ -643,13 +643,16 @@ void CheckOther::checkRedundantAssignment()
for (const Token* tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) { for (const Token* tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) {
if (tok2->str() == ";") if (tok2->str() == ";")
break; break;
else if (tok2->varId() == tok->varId()) else if (tok2->varId() == tok->varId()) {
error = false; error = false;
else if (Token::Match(tok2, "%name% (") && nonLocal(tok->variable())) { // Called function might use the variable break;
} else if (Token::Match(tok2, "%name% (") && nonLocal(tok->variable())) { // Called function might use the variable
const Function* const func = tok2->function(); const Function* const func = tok2->function();
const Variable* const var = tok->variable(); const Variable* const var = tok->variable();
if (!var || var->isGlobal() || var->isReference() || ((!func || func->nestedIn) && tok2->strAt(-1) != ".")) // Global variable, or member function if (!var || var->isGlobal() || var->isReference() || ((!func || func->nestedIn) && tok2->strAt(-1) != ".")) {// Global variable, or member function
error = false; error = false;
break;
}
} }
} }
if (error) { if (error) {