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

Fixed: (warning) Found simple pattern inside Token::Match() call.

This commit is contained in:
Edoardo Prezioso 2012-01-28 20:31:12 +01:00
parent 91a01a0a0d
commit bb703f4d0b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checknullpointer.cpp
View File

@ -1036,7 +1036,7 @@ void CheckNullPointer::nullConstantDereference()
nullPointerError(*it); nullPointerError(*it);
} }
} }
} else if (Token::Match(tok, "std :: string ( 0 )")) } else if (Token::simpleMatch(tok, "std :: string ( 0 )"))
nullPointerError(tok); nullPointerError(tok);
else if (Token::Match(tok, "%var% ( 0 )")) { else if (Token::Match(tok, "%var% ( 0 )")) {
const Variable* var = symbolDatabase->getVariableFromVarId(tok->varId()); const Variable* var = symbolDatabase->getVariableFromVarId(tok->varId());

6
lib/checkother.cpp
View File

@ -1706,7 +1706,7 @@ void CheckOther::checkUnsignedDivision()
if ((isUnsigned(var1) && isSigned(var2)) || (isUnsigned(var2) && isSigned(var1))) { if ((isUnsigned(var1) && isSigned(var2)) || (isUnsigned(var2) && isSigned(var1))) {
udivError(tok->next(), true); udivError(tok->next(), true);
} }
} else if (!ifTok && Token::Match(tok, "if (")) } else if (!ifTok && Token::simpleMatch(tok, "if ("))
ifTok = tok->next()->link()->next()->link(); ifTok = tok->next()->link()->next()->link();
else if (ifTok == tok) else if (ifTok == tok)
ifTok = 0; ifTok = 0;
@ -2534,12 +2534,12 @@ void CheckOther::checkDoubleFree()
else if (Token::Match(tok, "%var% (") && !Token::Match(tok, "printf|sprintf|snprintf|fprintf|if|while")) { else if (Token::Match(tok, "%var% (") && !Token::Match(tok, "printf|sprintf|snprintf|fprintf|if|while")) {
// If this is a new function definition, clear all variables // If this is a new function definition, clear all variables
if (Token::Match(tok->next()->link(), ") {")) { if (Token::simpleMatch(tok->next()->link(), ") {")) {
freedVariables.clear(); freedVariables.clear();
closeDirVariables.clear(); closeDirVariables.clear();
} }
// If it is a function call, then clear those variables in its argument list // If it is a function call, then clear those variables in its argument list
else if (Token::Match(tok->next()->link(), ") ;")) { else if (Token::simpleMatch(tok->next()->link(), ") ;")) {
for (const Token* tok2 = tok->tokAt(2); tok2 != tok->linkAt(1); tok2 = tok2->next()) { for (const Token* tok2 = tok->tokAt(2); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
if (Token::Match(tok2, "%var%")) { if (Token::Match(tok2, "%var%")) {
unsigned int var = tok2->varId(); unsigned int var = tok2->varId();

4
lib/tokenize.cpp
View File

@ -3854,9 +3854,9 @@ void Tokenizer::simplifyRealloc()
tok = tok->link(); tok = tok->link();
else if (Token::Match(tok, "[;{}] %var% = realloc (")) { else if (Token::Match(tok, "[;{}] %var% = realloc (")) {
tok = tok->tokAt(3); tok = tok->tokAt(3);
if (Token::Match(tok->next(), "( 0 ,")) { if (Token::simpleMatch(tok->next(), "( 0 ,")) {
//no "x = realloc(0,);" //no "x = realloc(0,);"
if (!Token::Match(tok->next()->link(), ") ;") || tok->next()->link()->previous() == tok->tokAt(3)) if (!Token::simpleMatch(tok->next()->link(), ") ;") || tok->next()->link()->previous() == tok->tokAt(3))
continue; continue;
// delete "0 ," // delete "0 ,"