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

Merge pull request #686 from Dmitry-Me/omitUnneededActions6 

Continue early, reuse pattern, better names
This commit is contained in:
orbitcowboy 2015-09-22 21:31:47 +02:00
parent 3bc4ea4e51 ce783483d1
commit fc0786acb0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkunusedvar.cpp
View File

@ -1183,12 +1183,14 @@ void CheckUnusedVar::checkStructMemberUsage()
} }
// bail out if struct is inherited // bail out if struct is inherited
if (!structname.empty() && Token::findmatch(tok, (",|private|protected|public " + structname).c_str())) if (!structname.empty() && Token::findmatch(tok, (",|private|protected|public " + structname).c_str())) {
structname.clear(); structname.clear();
continue;
}
// Bail out if some data is casted to struct.. // Bail out if some data is casted to struct..
const std::string s("( struct| " + tok->next()->str() + " * ) & %name% ["); const std::string castPattern("( struct| " + tok->next()->str() + " * ) & %name% [");
if (Token::findmatch(tok, s.c_str())) if (Token::findmatch(tok, castPattern.c_str()))
structname.clear(); structname.clear();
// Bail out if instance is initialized with {}.. // Bail out if instance is initialized with {}..
@ -1203,10 +1205,14 @@ void CheckUnusedVar::checkStructMemberUsage()
} }
} }
if (structname.empty())
continue;
// bail out for extern/global struct // bail out for extern/global struct
for (const Token *tok2 = Token::findmatch(tok, (structname + " %name%").c_str()); const std::string definitionPattern(structname + " %name%");
for (const Token *tok2 = Token::findmatch(tok, definitionPattern.c_str());
tok2 && tok2->next(); tok2 && tok2->next();
tok2 = Token::findmatch(tok2->next(), (structname + " %name%").c_str())) { tok2 = Token::findmatch(tok2->next(), definitionPattern.c_str())) {
const Variable *var = tok2->next()->variable(); const Variable *var = tok2->next()->variable();
if (var && (var->isExtern() || (var->isGlobal() && !var->isStatic()))) { if (var && (var->isExtern() || (var->isGlobal() && !var->isStatic()))) {