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

there is no need to have "if(tok && Token::Match(tok,..." since Token::Match checks "tok" by itselfs already.

This commit is contained in:
Matthias Krüger 2016-11-26 17:08:36 +01:00
parent 59bbe6cd42
commit b3ace258ab
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkio.cpp
View File

@ -1723,7 +1723,7 @@ bool CheckIO::ArgumentInfo::isArrayOrPointer() const
return variableInfo->isArrayOrPointer(); return variableInfo->isArrayOrPointer();
} else { } else {
const Token *tok = typeToken; const Token *tok = typeToken;
while (tok && Token::Match(tok, "const|struct")) while (Token::Match(tok, "const|struct"))
tok = tok->next(); tok = tok->next();
if (tok && tok->strAt(1) == "*") if (tok && tok->strAt(1) == "*")
return true; return true;

2
lib/checkuninitvar.cpp
View File

@ -985,7 +985,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc al
if (_tokenizer->isCPP() && Token::Match(vartok->next(), "<<|>>")) { if (_tokenizer->isCPP() && Token::Match(vartok->next(), "<<|>>")) {
// Is this calculation done in rhs? // Is this calculation done in rhs?
const Token *tok = vartok; const Token *tok = vartok;
while (tok && Token::Match(tok, "%name%|.|::")) while (Token::Match(tok, "%name%|.|::"))
tok = tok->previous(); tok = tok->previous();
if (Token::Match(tok, "[;{}]")) if (Token::Match(tok, "[;{}]"))
return false; return false;

2
lib/checkunusedvar.cpp
View File

@ -449,7 +449,7 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
tok = tok->next(); tok = tok->next();
if (Token::Match(tok, "(| &| %name%") || if (Token::Match(tok, "(| &| %name%") ||
(tok && Token::Match(tok->next(), "< const| struct|union| %type% *| > ( &| %name%"))) { (Token::Match(tok->next(), "< const| struct|union| %type% *| > ( &| %name%"))) {
bool addressOf = false; bool addressOf = false;
if (Token::Match(tok, "%var% .")) if (Token::Match(tok, "%var% ."))

2
lib/symboldatabase.cpp
View File

@ -240,7 +240,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
tok = tok->tokAt(3); tok = tok->tokAt(3);
// skip over qualification // skip over qualification
while (tok && Token::Match(tok, "%type% ::")) while (Token::Match(tok, "%type% ::"))
tok = tok->tokAt(2); tok = tok->tokAt(2);
} }

2
lib/templatesimplifier.cpp
View File

@ -245,7 +245,7 @@ unsigned int TemplateSimplifier::templateParameters(const Token *tok)
} }
// Skip '=', '?', ':' // Skip '=', '?', ':'
if (tok && Token::Match(tok, "=|?|:")) if (Token::Match(tok, "=|?|:"))
tok = tok->next(); tok = tok->next();
if (!tok) if (!tok)
return 0; return 0;