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

Fix compiler warning. Re-order if-expression for performance reasons

This commit is contained in:
Alexander Mai 2014-09-02 19:18:30 +02:00
parent a0d8fc1df4
commit 45dc4ca6be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkother.cpp
View File

@ -1175,9 +1175,9 @@ void CheckOther::checkUnreachableCode()
// that the goto jump was intended to skip some code on the first loop iteration. // that the goto jump was intended to skip some code on the first loop iteration.
bool labelInFollowingLoop = false; bool labelInFollowingLoop = false;
if (labelName && Token::Match(secondBreak, "while|do|for")) { if (labelName && Token::Match(secondBreak, "while|do|for")) {
const Token *scope = Token::findsimplematch(secondBreak, "{"); const Token *scope2 = Token::findsimplematch(secondBreak, "{");
if (scope) { if (scope2) {
for (const Token *tokIter = scope; tokIter != scope->link() && tokIter; tokIter = tokIter->next()) { for (const Token *tokIter = scope2; tokIter != scope2->link() && tokIter; tokIter = tokIter->next()) {
if (Token::Match(tokIter, "[;{}] %any% :") && labelName->str() == tokIter->strAt(1)) { if (Token::Match(tokIter, "[;{}] %any% :") && labelName->str() == tokIter->strAt(1)) {
labelInFollowingLoop = true; labelInFollowingLoop = true;
break; break;
@ -1248,7 +1248,7 @@ void CheckOther::checkUnsignedDivision()
if (tok->strAt(1)[0] == '-' && isUnsigned(tok->tokAt(3)->variable())) { if (tok->strAt(1)[0] == '-' && isUnsigned(tok->tokAt(3)->variable())) {
udivError(tok->next(), false); udivError(tok->next(), false);
} }
} else if (Token::Match(tok->next(), "%var% / %var%") && _settings->inconclusive && warning && !ifTok) { } else if (_settings->inconclusive && warning && !ifTok && Token::Match(tok->next(), "%var% / %var%")) {
const Variable* var1 = tok->next()->variable(); const Variable* var1 = tok->next()->variable();
const Variable* var2 = tok->tokAt(3)->variable(); const Variable* var2 = tok->tokAt(3)->variable();
if ((isUnsigned(var1) && isSigned(var2)) || (isUnsigned(var2) && isSigned(var1))) { if ((isUnsigned(var1) && isSigned(var2)) || (isUnsigned(var2) && isSigned(var1))) {