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

Merge pull request #362 from Dmitry-Me/betterVariableNamesFixTypoInComment 

Clearer variable names, fix typo in comment.
This commit is contained in:
Daniel Marjamäki 2014-07-11 17:00:52 +02:00
parent 4e9130061a 9829e0b48a
commit 40030ce27c
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkmemoryleak.cpp
View File

@ -523,8 +523,8 @@ void CheckMemoryLeakInFunction::parse_noreturn()
} }
// only check functions // only check functions
const std::size_t functions = symbolDatabase->functionScopes.size(); const std::size_t functionsCount = symbolDatabase->functionScopes.size();
for (std::size_t i = 0; i < functions; ++i) { for (std::size_t i = 0; i < functionsCount; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
// parse this function to check if it contains an "exit" call.. // parse this function to check if it contains an "exit" call..

46
lib/checkother.cpp
View File

@ -2549,10 +2549,10 @@ void CheckOther::checkInvalidFree()
Token::Match(tok, "delete [ ] ( %any% +|- %any%") || Token::Match(tok, "delete [ ] ( %any% +|- %any%") ||
Token::Match(tok, "delete %any% +|- %any%")) { Token::Match(tok, "delete %any% +|- %any%")) {
const int varIdx = tok->strAt(1) == "(" ? 2 : const int varIndex = tok->strAt(1) == "(" ? 2 :
tok->strAt(3) == "(" ? 4 : 1; tok->strAt(3) == "(" ? 4 : 1;
const unsigned int var1 = tok->tokAt(varIdx)->varId(); const unsigned int var1 = tok->tokAt(varIndex)->varId();
const unsigned int var2 = tok->tokAt(varIdx + 2)->varId(); const unsigned int var2 = tok->tokAt(varIndex + 2)->varId();
const std::map<unsigned int, bool>::iterator alloc1 = allocatedVariables.find(var1); const std::map<unsigned int, bool>::iterator alloc1 = allocatedVariables.find(var1);
const std::map<unsigned int, bool>::iterator alloc2 = allocatedVariables.find(var2); const std::map<unsigned int, bool>::iterator alloc2 = allocatedVariables.find(var2);
if (alloc1 != allocatedVariables.end()) { if (alloc1 != allocatedVariables.end()) {
@ -2594,18 +2594,18 @@ void CheckOther::checkDoubleFree()
// Keep track of any variables passed to "free()", "g_free()" or "closedir()", // Keep track of any variables passed to "free()", "g_free()" or "closedir()",
// and report an error if the same variable is passed twice. // and report an error if the same variable is passed twice.
if (Token::Match(tok, "free|g_free|closedir ( %var% )")) { if (Token::Match(tok, "free|g_free|closedir ( %var% )")) {
unsigned int var = tok->tokAt(2)->varId(); const unsigned int varId = tok->tokAt(2)->varId();
if (var) { if (varId) {
if (Token::Match(tok, "free|g_free")) { if (Token::Match(tok, "free|g_free")) {
if (freedVariables.find(var) != freedVariables.end()) if (freedVariables.find(varId) != freedVariables.end())
doubleFreeError(tok, tok->strAt(2)); doubleFreeError(tok, tok->strAt(2));
else else
freedVariables.insert(var); freedVariables.insert(varId);
} else if (tok->str() == "closedir") { } else if (tok->str() == "closedir") {
if (closeDirVariables.find(var) != closeDirVariables.end()) if (closeDirVariables.find(varId) != closeDirVariables.end())
doubleCloseDirError(tok, tok->strAt(2)); doubleCloseDirError(tok, tok->strAt(2));
else else
closeDirVariables.insert(var); closeDirVariables.insert(varId);
} }
} }
} }
@ -2613,13 +2613,13 @@ void CheckOther::checkDoubleFree()
// Keep track of any variables operated on by "delete" or "delete[]" // Keep track of any variables operated on by "delete" or "delete[]"
// and report an error if the same variable is delete'd twice. // and report an error if the same variable is delete'd twice.
else if (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")) { else if (Token::Match(tok, "delete %var% ;") || Token::Match(tok, "delete [ ] %var% ;")) {
int varIdx = (tok->strAt(1) == "[") ? 3 : 1; const int varIndex = (tok->strAt(1) == "[") ? 3 : 1;
unsigned int var = tok->tokAt(varIdx)->varId(); const unsigned int varId = tok->tokAt(varIndex)->varId();
if (var) { if (varId) {
if (freedVariables.find(var) != freedVariables.end()) if (freedVariables.find(varId) != freedVariables.end())
doubleFreeError(tok, tok->strAt(varIdx)); doubleFreeError(tok, tok->strAt(varIndex));
else else
freedVariables.insert(var); freedVariables.insert(varId);
} }
} }
@ -2653,10 +2653,10 @@ void CheckOther::checkDoubleFree()
// 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::simpleMatch(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 (tok2->varId()) { const unsigned int varId = tok2->varId();
unsigned int var = tok2->varId(); if (varId) {
freedVariables.erase(var); freedVariables.erase(varId);
closeDirVariables.erase(var); closeDirVariables.erase(varId);
} }
} }
} }
@ -2664,10 +2664,10 @@ void CheckOther::checkDoubleFree()
// If a pointer is assigned a new value, remove it from the set of previously freed variables // If a pointer is assigned a new value, remove it from the set of previously freed variables
else if (Token::Match(tok, "%var% =")) { else if (Token::Match(tok, "%var% =")) {
unsigned int var = tok->varId(); const unsigned int varId = tok->varId();
if (var) { if (varId) {
freedVariables.erase(var); freedVariables.erase(varId);
closeDirVariables.erase(var); closeDirVariables.erase(varId);
} }
} }

2
lib/token.h
View File

@ -113,7 +113,7 @@ public:
/** /**
* @return String of the token in given index, related to this token. * @return String of the token in given index, related to this token.
* If that token does not exist, an emptry string is being returned. * If that token does not exist, an empty string is being returned.
*/ */
const std::string &strAt(int index) const; const std::string &strAt(int index) const;