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

Fix warnings (#1476)

This commit is contained in:
Paul Fultz II 2018-11-11 23:08:57 -06:00 committed by Daniel Marjamäki
parent 68d6b96878
commit 5bda102897
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/valueflow.cpp
View File

@ -1181,14 +1181,14 @@ static void valueFlowTerminatingCondition(TokenList *tokenlist, SymbolDatabase*
continue; continue;
} }
ErrorPath errorPath; ErrorPath errorPath;
if (isOppositeCond(true, cpp, tok, cond.first, settings->library, true, &errorPath)) { if (isOppositeCond(true, cpp, tok, cond.first, settings->library, true, true, &errorPath)) {
ValueFlow::Value val(1); ValueFlow::Value val(1);
val.setKnown(); val.setKnown();
val.condition = cond.first; val.condition = cond.first;
val.errorPath = errorPath; val.errorPath = errorPath;
val.errorPath.emplace_back(cond.first, "Assuming condition '" + cond.first->expressionString() + "' is false"); val.errorPath.emplace_back(cond.first, "Assuming condition '" + cond.first->expressionString() + "' is false");
setTokenValue(tok, val, tokenlist->getSettings()); setTokenValue(tok, val, tokenlist->getSettings());
} else if (isSameExpression(cpp, true, tok, cond.first, settings->library, true, &errorPath)) { } else if (isSameExpression(cpp, true, tok, cond.first, settings->library, true, true, &errorPath)) {
ValueFlow::Value val(0); ValueFlow::Value val(0);
val.setKnown(); val.setKnown();
val.condition = cond.first; val.condition = cond.first;
@ -2989,7 +2989,7 @@ struct Lambda {
} }
}; };
static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase* symboldatabase, ErrorLogger *errorLogger, const Settings *settings) static void valueFlowLifetime(TokenList *tokenlist, SymbolDatabase*, ErrorLogger *errorLogger, const Settings *settings)
{ {
for (Token *tok = tokenlist->front(); tok; tok = tok->next()) { for (Token *tok = tokenlist->front(); tok; tok = tok->next()) {
Lambda lam(tok); Lambda lam(tok);