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

Merge pull request #83 from simartin/clang_warn_fix 

Fixed shadowing warning
This commit is contained in:
PKEuS 2012-03-08 23:43:44 -08:00
parent e0bee0e037 190cba519d
commit 81e4eb6503
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkother.cpp
View File

@ -616,11 +616,11 @@ void CheckOther::checkRedundantAssignmentInSwitch()
// case 3: b = 1; // <== redundant // case 3: b = 1; // <== redundant
// case 4: b = 2; // case 4: b = 2;
if (Token::Match(tok2->previous(), ";|{|}|: %var% = %any% ;") && tok2->varId() != 0) { if (Token::Match(tok2->previous(), ";|{|}|: %var% = %any% ;") && tok2->varId() != 0) {
std::map<unsigned int, const Token*>::iterator i = varsAssigned.find(tok2->varId()); std::map<unsigned int, const Token*>::iterator i2 = varsAssigned.find(tok2->varId());
if (i == varsAssigned.end()) if (i2 == varsAssigned.end())
varsAssigned[tok2->varId()] = tok2; varsAssigned[tok2->varId()] = tok2;
else else
redundantAssignmentInSwitchError(i->second, i->second->str()); redundantAssignmentInSwitchError(i2->second, i2->second->str());
stringsCopied.erase(tok2->varId()); stringsCopied.erase(tok2->varId());
} }
@ -628,11 +628,11 @@ void CheckOther::checkRedundantAssignmentInSwitch()
// case 3: strcpy(str, "a"); // <== redundant // case 3: strcpy(str, "a"); // <== redundant
// case 4: strcpy(str, "b"); // case 4: strcpy(str, "b");
else if (Token::Match(tok2->previous(), ";|{|}|: strcpy|strncpy ( %var% ,") && tok2->tokAt(2)->varId() != 0) { else if (Token::Match(tok2->previous(), ";|{|}|: strcpy|strncpy ( %var% ,") && tok2->tokAt(2)->varId() != 0) {
std::map<unsigned int, const Token*>::iterator i = stringsCopied.find(tok2->tokAt(2)->varId()); std::map<unsigned int, const Token*>::iterator i2 = stringsCopied.find(tok2->tokAt(2)->varId());
if (i == stringsCopied.end()) if (i2 == stringsCopied.end())
stringsCopied[tok2->tokAt(2)->varId()] = tok2->tokAt(2); stringsCopied[tok2->tokAt(2)->varId()] = tok2->tokAt(2);
else else
redundantStrcpyInSwitchError(i->second, i->second->str()); redundantStrcpyInSwitchError(i2->second, i2->second->str());
} }
// Not a simple assignment so there may be good reason if this variable is assigned to twice. E.g.: // Not a simple assignment so there may be good reason if this variable is assigned to twice. E.g.:
// case 3: b = 1; // case 3: b = 1;