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

Refactorizations: 

- Fixed several findings of CheckInternal.
- Removed some debug code from CheckOther::checkRedundantAssignment().
This commit is contained in:
PKEuS 2012-09-07 11:59:20 +02:00
parent 489df29346
commit e4a693eaab
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkbufferoverrun.cpp
View File

@ -833,7 +833,7 @@ void CheckBufferOverrun::arrayIndexInForLoop(const Token *tok, const ArrayInfo &
for (const Token *loopTok = tok3->tokAt(2); loopTok->str() != "}" ; loopTok = loopTok->next()) { for (const Token *loopTok = tok3->tokAt(2); loopTok->str() != "}" ; loopTok = loopTok->next()) {
if (usedInArray && (counter_varid == loopTok->varId())) { if (usedInArray && (counter_varid == loopTok->varId())) {
if (Token::Match(loopTok->next(), " ++ ") || if (loopTok->strAt(1) == "++" ||
(loopTok->previous()->type() == Token::eIncDecOp)) { (loopTok->previous()->type() == Token::eIncDecOp)) {
bufferOverrunError(tok, arrayInfo.varname()); bufferOverrunError(tok, arrayInfo.varname());
} }

14
lib/checkother.cpp
View File

@ -241,7 +241,7 @@ void CheckOther::clarifyStatement()
if (Token::Match(tok, "* %var%")) { if (Token::Match(tok, "* %var%")) {
const Token *tok2=tok->previous(); const Token *tok2=tok->previous();
while (Token::Match(tok2, "*")) while (tok2 && tok2->str() == "*")
tok2=tok2->previous(); tok2=tok2->previous();
if (Token::Match(tok2, "[{};]")) { if (Token::Match(tok2, "[{};]")) {
@ -649,8 +649,6 @@ void CheckOther::checkRedundantAssignment()
if (!scope->isExecutable()) if (!scope->isExecutable())
continue; continue;
///std::cout << std::endl << "scope: " << i->className << std::endl;
std::map<unsigned int, const Token*> varAssignments; std::map<unsigned int, const Token*> varAssignments;
std::map<unsigned int, const Token*> memAssignments; std::map<unsigned int, const Token*> memAssignments;
const Token* writtenArgumentsEnd = 0; const Token* writtenArgumentsEnd = 0;
@ -671,7 +669,6 @@ void CheckOther::checkRedundantAssignment()
} else if (tok->type() == Token::eVariable) { } else if (tok->type() == Token::eVariable) {
std::map<unsigned int, const Token*>::iterator it = varAssignments.find(tok->varId()); std::map<unsigned int, const Token*>::iterator it = varAssignments.find(tok->varId());
if (tok->next()->isAssignmentOp() && Token::Match(tok->previous(), "[;{}]")) { // Assignment if (tok->next()->isAssignmentOp() && Token::Match(tok->previous(), "[;{}]")) { // Assignment
///std::cout << "assign: " << tok->varId() << std::endl;
if (it != varAssignments.end()) { if (it != varAssignments.end()) {
bool error = true; // Ensure that variable is not used on right side bool error = true; // Ensure that variable is not used on right side
for (const Token* tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) { for (const Token* tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) {
@ -693,8 +690,7 @@ void CheckOther::checkRedundantAssignment()
} else if (tok->next()->type() == Token::eIncDecOp || (tok->previous()->type() == Token::eIncDecOp && !Token::Match(tok->next(), ".|[|("))) { // Variable incremented/decremented } else if (tok->next()->type() == Token::eIncDecOp || (tok->previous()->type() == Token::eIncDecOp && !Token::Match(tok->next(), ".|[|("))) { // Variable incremented/decremented
varAssignments[tok->varId()] = tok; varAssignments[tok->varId()] = tok;
memAssignments.erase(tok->varId()); memAssignments.erase(tok->varId());
} else if (!Token::Match(tok->tokAt(-2), "sizeof (")) { // Other usage of variable } else if (!Token::simpleMatch(tok->tokAt(-2), "sizeof (")) { // Other usage of variable
///std::cout << "use: " << tok->varId() << std::endl;
if (it != varAssignments.end()) if (it != varAssignments.end())
varAssignments.erase(it); varAssignments.erase(it);
if (!writtenArgumentsEnd) // Indicates that we are in the first argument of strcpy/memcpy/... function if (!writtenArgumentsEnd) // Indicates that we are in the first argument of strcpy/memcpy/... function
@ -1893,7 +1889,7 @@ void CheckOther::checkConstantFunctionParameter()
// const stream parameter). // const stream parameter).
if (Token::Match(tok, "std :: string|wstring")) { if (Token::Match(tok, "std :: string|wstring")) {
passedByValueError(tok, var->name()); passedByValueError(tok, var->name());
} else if (Token::Match(tok, "std :: %type% <") && !Token::Match(tok->linkAt(3), "> ::")) { } else if (Token::Match(tok, "std :: %type% <") && !Token::simpleMatch(tok->linkAt(3), "> ::")) {
passedByValueError(tok, var->name()); passedByValueError(tok, var->name());
} else if (var->type() || symbolDatabase->isClassOrStruct(tok->str())) { // Check if type is a struct or class. } else if (var->type() || symbolDatabase->isClassOrStruct(tok->str())) { // Check if type is a struct or class.
passedByValueError(tok, var->name()); passedByValueError(tok, var->name());
@ -3075,7 +3071,7 @@ void CheckOther::sizeofCalculation()
if (Token::simpleMatch(tok, "sizeof (")) { if (Token::simpleMatch(tok, "sizeof (")) {
const Token* const end = tok->linkAt(1); const Token* const end = tok->linkAt(1);
for (const Token *tok2 = tok->tokAt(2); tok2 != end; tok2 = tok2->next()) { for (const Token *tok2 = tok->tokAt(2); tok2 != end; tok2 = tok2->next()) {
if (tok2->isOp() && (!tok2->isExpandedMacro() || _settings->inconclusive) && !Token::Match(tok2, ">|<|&") && (Token::Match(tok2->previous(), "%var%") || !Token::Match(tok2, "*"))) { if (tok2->isOp() && (!tok2->isExpandedMacro() || _settings->inconclusive) && !Token::Match(tok2, ">|<|&") && (Token::Match(tok2->previous(), "%var%") || tok2->str() != "*")) {
if (!(Token::Match(tok2->previous(), "%type%") || Token::Match(tok2->next(), "%type%"))) { if (!(Token::Match(tok2->previous(), "%type%") || Token::Match(tok2->next(), "%type%"))) {
sizeofCalculationError(tok2, tok2->isExpandedMacro()); sizeofCalculationError(tok2, tok2->isExpandedMacro());
break; break;
@ -3370,7 +3366,7 @@ void CheckOther::checkIncompleteArrayFill()
if (MathLib::toLongNumber(tok->linkAt(1)->strAt(-1)) == var->dimension(0)) { if (MathLib::toLongNumber(tok->linkAt(1)->strAt(-1)) == var->dimension(0)) {
unsigned int size = _tokenizer->sizeOfType(var->typeStartToken()); unsigned int size = _tokenizer->sizeOfType(var->typeStartToken());
if ((size != 1 && size != 100 && size != 0) || Token::Match(var->typeEndToken(), "*")) if ((size != 1 && size != 100 && size != 0) || var->typeEndToken()->str() == "*")
incompleteArrayFillError(tok, var->name(), tok->str(), false); incompleteArrayFillError(tok, var->name(), tok->str(), false);
else if (var->typeStartToken()->str() == "bool" && _settings->isEnabled("portability")) // sizeof(bool) is not 1 on all platforms else if (var->typeStartToken()->str() == "bool" && _settings->isEnabled("portability")) // sizeof(bool) is not 1 on all platforms
incompleteArrayFillError(tok, var->name(), tok->str(), true); incompleteArrayFillError(tok, var->name(), tok->str(), true);

2
lib/checkunusedvar.cpp
View File

@ -760,7 +760,7 @@ void CheckUnusedVar::checkFunctionVariableUsage_iterateScopes(const Scope* const
} }
} }
else if (Token::Match(tok->tokAt(-2), "while|if") && Token::Match(tok->tokAt(1), "=") && tok->varId() && tok->varId() == tok->tokAt(2)->varId()) { else if (Token::Match(tok->tokAt(-2), "while|if") && tok->strAt(1) == "=" && tok->varId() && tok->varId() == tok->tokAt(2)->varId()) {
variables.use(tok->tokAt(2)->varId(), tok); variables.use(tok->tokAt(2)->varId(), tok);
} }
// assignment // assignment

6
lib/tokenize.cpp
View File

@ -8654,7 +8654,7 @@ void Tokenizer::simplifyNamespaceStd()
} }
for (Token* tok = list.front(); tok; tok = tok->next()) { for (Token* tok = list.front(); tok; tok = tok->next()) {
if (_settings->standards.cpp == Standards::CPP11 && Token::Match(tok, "std :: tr1 ::")) if (_settings->standards.cpp == Standards::CPP11 && Token::simpleMatch(tok, "std :: tr1 ::"))
Token::eraseTokens(tok, tok->tokAt(3)); Token::eraseTokens(tok, tok->tokAt(3));
else if (Token::Match(tok, "using namespace std ;")) { else if (Token::Match(tok, "using namespace std ;")) {
@ -9230,12 +9230,12 @@ void Tokenizer::simplifyMathExpressions()
{ {
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
if (Token::Match(tok,"exp ( 0 )") || Token::Match(tok,"cosh ( 0 )") || Token::Match(tok,"cos ( 0 )") || Token::Match(tok,"sqrt ( 1 )")) { if (Token::Match(tok,"exp|cosh|cos ( 0 )") || Token::simpleMatch(tok,"sqrt ( 1 )")) {
tok->deleteNext(3); tok->deleteNext(3);
tok->str("1"); tok->str("1");
} }
if (Token::Match(tok,"sinh ( 0 )") || Token::Match(tok,"sin ( 0 )") || Token::Match(tok,"sqrt ( 0 )") || Token::Match(tok,"ln ( 1 )")) { if (Token::Match(tok,"sin|sinh|sqrt ( 0 )") || Token::simpleMatch(tok,"ln ( 1 )")) {
tok->deleteNext(3); tok->deleteNext(3);
tok->str("0"); tok->str("0");
} }