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

CheckOther: Removed unused functions

This commit is contained in:
Daniel Marjamäki 2008-05-14 04:30:56 +00:00
parent 3bf21680b2
commit c2b76372b9
2 changed files with 6 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
CheckOther.cpp
View File

@ -124,19 +124,18 @@ void WarningRedundantCode()
if (varname1==NULL || tok2==NULL)
continue;
if ( tok2->str[0] == '{' )
tok2 = tok2->next;
bool err = false;
if (Match(tok2,"delete %var% ;"))
err = (strcmp(getstr(tok2,1),varname1)==0);
else if (Match(tok2,"{ delete %var% ; }"))
err = (strcmp(getstr(tok2,2),varname1)==0);
else if (Match(tok2,"delete [ ] %var% ;"))
err = (strcmp(getstr(tok2,1),varname1)==0);
else if (Match(tok2,"{ delete [ ] %var% ; }"))
err = (strcmp(getstr(tok2,2),varname1)==0);
else if (Match(tok2,"free ( %var% )"))
err = (strcmp(getstr(tok2,2),varname1)==0);
else if (Match(tok2,"{ free ( %var% ) ; }"))
err = (strcmp(getstr(tok2,3),varname1)==0);
else if (Match(tok2,"kfree ( %var% )"))
err = (strcmp(getstr(tok2,2),varname1)==0);
if (err)
{
@ -241,7 +240,7 @@ void WarningIf()
ostr << (i < 3 ? "True" : "False");
}
ReportErr(ostr.str());
}
}
}
//---------------------------------------------------------------------------
@ -292,115 +291,6 @@ void InvalidFunctionUsage()
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Dangerous usage of 'strtok'
//---------------------------------------------------------------------------
static const TOKEN *GetFunction( const TOKEN *content )
{
const TOKEN *func = NULL;
int indentlevel = 0;
for (const TOKEN *tok = tokens; tok; tok = tok->next)
{
if ( tok->str[0] == '{' )
indentlevel++;
else if ( tok->str[0] == '}' )
{
indentlevel--;
if (indentlevel == 0)
func = NULL;
}
else if (indentlevel == 0)
{
if (tok->str[0] == ';')
func = NULL;
else if ( Match(tok, "%var% :: %var% (") )
func = tok->next->next;
else if ( Match(tok, "%type% %var% (") )
func = tok->next;
}
else if (indentlevel>0 && func)
{
if ( tok == content )
return func;
}
}
return NULL;
}
void WarningStrTok()
{
std::list<const TOKEN *> funclist;
// Which functions contain the 'strtok'?
for (const TOKEN *tok = tokens; tok; tok = tok->next)
{
if (strcmp(tok->str,"strtok")!=0)
continue;
const TOKEN *func = GetFunction(tok);
if (!func)
continue;
funclist.push_back( func );
}
// No functions in list => No errors
if ( funclist.empty() )
return;
// Take closer look at the strtok usage.
std::list<const TOKEN *>::const_iterator it1;
for (it1 = funclist.begin(); it1 != funclist.end(); it1++)
{
// Search this function to check that it doesn't call any other of
// the functions in the funclist.
int indentlevel = 0;
for ( const TOKEN *tok = *it1; tok; tok = tok->next )
{
if ( tok->str[0] == '{' )
indentlevel++;
else if ( tok->str[0] == '}' )
{
if ( indentlevel <= 1 )
break;
indentlevel--;
}
else if ( indentlevel >= 1 )
{
// Only interested in function calls..
if (!(IsName(tok->str) && strcmp(getstr(tok,1), "(") == 0))
continue;
// Check if function name is in funclist..
std::list<const TOKEN *>::const_iterator it2;
for (it2 = funclist.begin(); it2 != funclist.end(); it2++)
{
if ( strcmp( tok->str, (*it2)->str ) )
continue;
std::ostringstream ostr;
ostr << FileLine(tok) << ": Possible bug. Both '" << (*it1)->str << "' and '" << (*it2)->str << "' uses strtok.";
ReportErr(ostr.str());
break;
}
}
}
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Assignment in condition
//---------------------------------------------------------------------------
@ -422,56 +312,6 @@ void CheckIfAssignment()
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Check for case without break
//---------------------------------------------------------------------------
void CheckCaseWithoutBreak()
{
for ( const TOKEN *tok = tokens; tok; tok = tok->next )
{
if ( strcmp(tok->str,"case")!=0 )
continue;
// Found a case, check that there's a break..
int indentlevel = 0;
for (const TOKEN *tok2 = tok->next; tok2; tok2 = tok2->next)
{
if (tok2->str[0] == '{')
indentlevel++;
else if (tok2->str[0] == '}')
{
indentlevel--;
if (indentlevel < 0)
{
std::ostringstream ostr;
ostr << FileLine(tok) << ": 'case' without 'break'.";
ReportErr(ostr.str());
}
}
if (indentlevel==0)
{
if (strcmp(tok2->str,"break")==0)
break;
if (strcmp(tok2->str,"return")==0)
break;
if (strcmp(tok2->str,"case")==0)
{
std::ostringstream ostr;
ostr << FileLine(tok) << ": Found 'case' without 'break'.";
ReportErr(ostr.str());
break;
}
}
}
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Check for unsigned divisions
//---------------------------------------------------------------------------

6
CheckOther.h
View File

@ -28,12 +28,6 @@ void WarningDangerousFunctions();
// Invalid function usage..
void InvalidFunctionUsage();
// Dangerous usage of 'strtok'
void WarningStrTok();
// Check for a 'case' without a 'break'
void CheckCaseWithoutBreak();
// Check for unsigned division that might create bad results
void CheckUnsignedDivision();