noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup isStatic in CheckOther::functionVariableUsage()

This commit is contained in:
Robert Reif 2011-07-01 07:15:59 -04:00
parent 7826b5e22d
commit 3225c9dd9b
1 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/checkother.cpp
View File

@ -1757,12 +1757,12 @@ void CheckOther::functionVariableUsage()
{ {
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
if (isStatic)
tok = tok->next(); tok = tok->next();
variables.addVar(tok->next(), Variables::standard, info, variables.addVar(tok->next(), Variables::standard, info,
tok->tokAt(2)->str() == "=" || tok->tokAt(2)->str() == "=" || isStatic);
tok->previous()->str() == "static");
tok = tok->next(); tok = tok->next();
} }
@ -1789,15 +1789,11 @@ void CheckOther::functionVariableUsage()
else if (Token::Match(tok, "[;{}] static| const| %type% *| %var% [ %any% ] ;|=") && else if (Token::Match(tok, "[;{}] static| const| %type% *| %var% [ %any% ] ;|=") &&
nextIsStandardType(tok)) nextIsStandardType(tok))
{ {
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();
@ -1834,15 +1830,11 @@ void CheckOther::functionVariableUsage()
// int * i; int * j = 0; static int * k = 0; // int * i; int * j = 0; static int * k = 0;
else if (Token::Match(tok, "[;{}] static| const| %type% *|& %var% ;|=")) else if (Token::Match(tok, "[;{}] static| const| %type% *|& %var% ;|="))
{ {
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();
@ -1877,15 +1869,11 @@ void CheckOther::functionVariableUsage()
// int ** i; int ** j = 0; static int ** k = 0; // int ** i; int ** j = 0; static int ** k = 0;
else if (Token::Match(tok, "[;{}] static| const| %type% * * %var% ;|=")) else if (Token::Match(tok, "[;{}] static| const| %type% * * %var% ;|="))
{ {
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();
@ -1911,15 +1899,12 @@ void CheckOther::functionVariableUsage()
else if (Token::Match(tok, "[;{}] static| const| struct|union %type% *|& %var% ;|=")) else if (Token::Match(tok, "[;{}] static| const| struct|union %type% *|& %var% ;|="))
{ {
Variables::VariableType type; Variables::VariableType type;
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();
@ -1997,15 +1982,11 @@ void CheckOther::functionVariableUsage()
// int * p[10]; int * q[10] = { 0 }; static int * * r[10] = { 0 }; // int * p[10]; int * q[10] = { 0 }; static int * * r[10] = { 0 };
else if (Token::Match(tok, "[;{}] static| const| %type% *|& %var% [ %any% ] ;|=")) else if (Token::Match(tok, "[;{}] static| const| %type% *|& %var% [ %any% ] ;|="))
{ {
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();
@ -2028,15 +2009,11 @@ void CheckOther::functionVariableUsage()
// struct S * p[10]; struct T * q[10] = { 0 }; static struct S * r[10] = { 0 }; // struct S * p[10]; struct T * q[10] = { 0 }; static struct S * r[10] = { 0 };
else if (Token::Match(tok, "[;{}] static| const| struct|union %type% *|& %var% [ %any% ] ;|=")) else if (Token::Match(tok, "[;{}] static| const| struct|union %type% *|& %var% [ %any% ] ;|="))
{ {
bool isStatic = false;
tok = tok->next(); tok = tok->next();
if (tok->str() == "static") const bool isStatic = tok->str() == "static";
{ if (isStatic)
tok = tok->next(); tok = tok->next();
isStatic = true;
}
if (tok->str() == "const") if (tok->str() == "const")
tok = tok->next(); tok = tok->next();