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

Refactoring: Getting rid of %var1%

This commit is contained in:
Reijo Tomperi 2009-01-05 22:47:27 +00:00
parent a559b06c1f
commit 49b864b1fd
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
checkmemoryleak.cpp
View File

@ -238,6 +238,17 @@ const char * CheckMemoryLeakClass::call_func(const Token *tok, std::list<const T
int par = 1; int par = 1;
int parlevel = 0; int parlevel = 0;
std::string pattern = "[,()] ";
for (int i = 0; varnames[i]; i++)
{
if (i > 0)
pattern += " . ";
pattern += varnames[i];
}
pattern += " [,()]";
for (; tok; tok = tok->next()) for (; tok; tok = tok->next())
{ {
if (tok->str() == "(") if (tok->str() == "(")
@ -253,7 +264,7 @@ const char * CheckMemoryLeakClass::call_func(const Token *tok, std::list<const T
{ {
if (tok->str() == ",") if (tok->str() == ",")
++par; ++par;
if (Token::Match(tok, "[,()] %var1% [,()]", 0, varnames)) if (Token::Match(tok, pattern.c_str()))
{ {
const Token *ftok = _tokenizer->GetFunctionTokenByName(funcname); const Token *ftok = _tokenizer->GetFunctionTokenByName(funcname);
const char *parname = Tokenizer::getParameterName(ftok, par); const char *parname = Tokenizer::getParameterName(ftok, par);
@ -321,12 +332,21 @@ void CheckMemoryLeakClass::instoken(Token *tok, const char str[])
bool CheckMemoryLeakClass::notvar(const Token *tok, const char *varnames[]) bool CheckMemoryLeakClass::notvar(const Token *tok, const char *varnames[])
{ {
return bool(Token::Match(tok, "! %var1% [;)&|]", 0, varnames) || std::string varname;
Token::Match(tok, "! ( %var1% )", 0, varnames) || for (int i = 0; varnames[i]; i++)
Token::Match(tok, "unlikely ( ! %var1% )", 0, varnames) || {
Token::Match(tok, "unlikely ( %var1% == 0 )", 0, varnames) || if (i > 0)
Token::Match(tok, "0 == %var1% [;)&|]", 0, varnames) || varname += " . ";
Token::Match(tok, "%var1% == 0", 0, varnames));
varname += varnames[i];
}
return bool(Token::Match(tok, std::string("! " + varname + " [;)&|]").c_str()) ||
Token::simpleMatch(tok, std::string("! ( " + varname + " )").c_str()) ||
Token::simpleMatch(tok, std::string("unlikely ( ! " + varname + " )").c_str()) ||
Token::simpleMatch(tok, std::string("unlikely ( " + varname + " == 0 )").c_str()) ||
Token::Match(tok, std::string("0 == " + varname + " [;)&|]").c_str()) ||
Token::simpleMatch(tok, std::string(varname + " == 0").c_str()));
} }
Token *CheckMemoryLeakClass::getcode(const Token *tok, std::list<const Token *> callstack, const char varname[], AllocType &alloctype, AllocType &dealloctype) Token *CheckMemoryLeakClass::getcode(const Token *tok, std::list<const Token *> callstack, const char varname[], AllocType &alloctype, AllocType &dealloctype)