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

Memory leak: refactoring - changed "aaaa" to "str"

This commit is contained in:
Daniel Marjamäki 2008-12-05 19:37:11 +00:00
parent f7a846e31e
commit 48dd250796
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CheckMemoryLeak.cpp
View File

@ -70,9 +70,9 @@ CheckMemoryLeakClass::AllocType CheckMemoryLeakClass::GetAllocationType( const T
// * var = (char *)malloc(10); // * var = (char *)malloc(10);
// * var = new char[10]; // * var = new char[10];
// * var = strdup("hello"); // * var = strdup("hello");
if ( tok2 && tok2->aaaa0() == '(' ) if ( tok2 && tok2->str() == "(" )
{ {
while ( tok2 && tok2->aaaa0() != ')' ) while ( tok2 && tok2->str() != ")" )
tok2 = tok2->next; tok2 = tok2->next;
tok2 = tok2 ? tok2->next : NULL; tok2 = tok2 ? tok2->next : NULL;
} }
@ -180,7 +180,7 @@ const char * CheckMemoryLeakClass::call_func( const TOKEN *tok, std::list<const
const char *funcname = tok->aaaa(); const char *funcname = tok->aaaa();
for ( std::list<const TOKEN *>::const_iterator it = callstack.begin(); it != callstack.end(); ++it ) for ( std::list<const TOKEN *>::const_iterator it = callstack.begin(); it != callstack.end(); ++it )
{ {
if ( std::string(funcname) == (*it)->aaaa() ) if ( (*it)->str() == funcname )
return "dealloc"; return "dealloc";
} }
callstack.push_back(tok); callstack.push_back(tok);
@ -315,12 +315,12 @@ TOKEN *CheckMemoryLeakClass::getcode(const TOKEN *tok, std::list<const TOKEN *>
int parlevel = 0; int parlevel = 0;
for ( ; tok; tok = tok->next ) for ( ; tok; tok = tok->next )
{ {
if ( tok->aaaa0() == '{' ) if ( tok->str() == "{" )
{ {
addtoken( "{" ); addtoken( "{" );
indentlevel++; indentlevel++;
} }
else if ( tok->aaaa0() == '}' ) else if ( tok->str() == "}" )
{ {
addtoken( "}" ); addtoken( "}" );
if ( indentlevel <= 0 ) if ( indentlevel <= 0 )
@ -836,10 +836,10 @@ void CheckMemoryLeakClass::simplifycode(TOKEN *tok)
bool incase = false; bool incase = false;
for ( const TOKEN * _tok = tok2->tokAt(2); _tok; _tok = _tok->next ) for ( const TOKEN * _tok = tok2->tokAt(2); _tok; _tok = _tok->next )
{ {
if ( _tok->aaaa0() == '{' ) if ( _tok->str() == "{" )
break; break;
else if ( _tok->aaaa0() == '}' ) else if ( _tok->str() == "}" )
{ {
valid = true; valid = true;
break; break;
@ -848,10 +848,10 @@ void CheckMemoryLeakClass::simplifycode(TOKEN *tok)
else if (strncmp(_tok->aaaa(),"if",2)==0) else if (strncmp(_tok->aaaa(),"if",2)==0)
break; break;
else if (strcmp(_tok->aaaa(),"switch")==0) else if (_tok->str() == "switch")
break; break;
else if (strcmp(_tok->aaaa(),"loop")==0) else if (_tok->str() == "loop")
break; break;
else if (incase && TOKEN::Match(_tok,"case")) else if (incase && TOKEN::Match(_tok,"case"))
@ -885,7 +885,7 @@ void CheckMemoryLeakClass::simplifycode(TOKEN *tok)
instoken( tok2, "if" ); instoken( tok2, "if" );
instoken( tok2, "else" ); instoken( tok2, "else" );
} }
while ( tok2 && tok2->aaaa0() != '}' && ! TOKEN::Match(tok2,"break ;") ) while ( tok2 && tok2->str() != "}" && ! TOKEN::Match(tok2,"break ;") )
tok2 = tok2->next; tok2 = tok2->next;
if (TOKEN::Match(tok2,"break ;")) if (TOKEN::Match(tok2,"break ;"))
{ {
@ -1036,10 +1036,10 @@ void CheckMemoryLeakClass::CheckMemoryLeak_InFunction()
int indentlevel = 0; int indentlevel = 0;
for (const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next) for (const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next)
{ {
if (tok->aaaa0()=='{') if (tok->str() == "{")
indentlevel++; indentlevel++;
else if (tok->aaaa0()=='}') else if (tok->str() == "}")
indentlevel--; indentlevel--;
@ -1079,10 +1079,10 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers()
int indentlevel = 0; int indentlevel = 0;
for ( const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next ) for ( const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next )
{ {
if ( tok->aaaa0() == '{' ) if ( tok->str() == "{" )
indentlevel++; indentlevel++;
else if ( tok->aaaa0() == '}' ) else if ( tok->str() == "}" )
indentlevel--; indentlevel--;
else if ( indentlevel == 0 && TOKEN::Match(tok, "class %var% [{:]") ) else if ( indentlevel == 0 && TOKEN::Match(tok, "class %var% [{:]") )
@ -1098,7 +1098,7 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers()
void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_ParseClass( const TOKEN *tok1, std::vector<const char *> &classname ) void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_ParseClass( const TOKEN *tok1, std::vector<const char *> &classname )
{ {
// Go into class. // Go into class.
while ( tok1 && tok1->aaaa0() != '{' ) while ( tok1 && tok1->str() != "{" )
tok1 = tok1->next; tok1 = tok1->next;
if ( tok1 ) if ( tok1 )
tok1 = tok1->next; tok1 = tok1->next;
@ -1106,10 +1106,10 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_ParseClass( const TOKEN
int indentlevel = 0; int indentlevel = 0;
for ( const TOKEN *tok = tok1; tok; tok = tok->next ) for ( const TOKEN *tok = tok1; tok; tok = tok->next )
{ {
if ( tok->aaaa0() == '{' ) if ( tok->str() == "{" )
indentlevel++; indentlevel++;
else if ( tok->aaaa0() == '}' ) else if ( tok->str() == "}" )
{ {
indentlevel--; indentlevel--;
if ( indentlevel < 0 ) if ( indentlevel < 0 )
@ -1131,7 +1131,7 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_ParseClass( const TOKEN
// Declaring member variable.. check allocations and deallocations // Declaring member variable.. check allocations and deallocations
if ( TOKEN::Match(tok->next, "%type% * %var% ;") ) if ( TOKEN::Match(tok->next, "%type% * %var% ;") )
{ {
if ( tok->isName() || strchr(";}", tok->aaaa0()) ) if ( tok->isName() || TOKEN::Match(tok, "[;}]"))
{ {
if (_settings._showAll || !isclass(tok->tokAt(1))) if (_settings._showAll || !isclass(tok->tokAt(1)))
CheckMemoryLeak_ClassMembers_Variable( classname, tok->strAt(3) ); CheckMemoryLeak_ClassMembers_Variable( classname, tok->strAt(3) );
@ -1177,16 +1177,16 @@ void CheckMemoryLeakClass::CheckMemoryLeak_ClassMembers_Variable( const std::vec
int indentlevel = 0; int indentlevel = 0;
for ( const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next ) for ( const TOKEN *tok = _tokenizer->tokens(); tok; tok = tok->next )
{ {
if ( tok->aaaa0() == '{' ) if ( tok->str() == "{" )
indentlevel++; indentlevel++;
else if ( tok->aaaa0() == '}' ) else if ( tok->str() == "}" )
indentlevel--; indentlevel--;
// Set the 'memberfunction' variable.. // Set the 'memberfunction' variable..
if ( indentlevel == 0 ) if ( indentlevel == 0 )
{ {
if ( strchr(";}", tok->aaaa0()) ) if ( TOKEN::Match(tok, "[;}]") )
memberfunction = false; memberfunction = false;
else if ( TOKEN::Match( tok, fpattern.str().c_str() ) || TOKEN::Match( tok, destructor.str().c_str() ) ) else if ( TOKEN::Match( tok, fpattern.str().c_str() ) || TOKEN::Match( tok, destructor.str().c_str() ) )
memberfunction = true; memberfunction = true;