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

struct member usage: bail out the check if the struct contain any functions

This commit is contained in:
Daniel Marjamäki 2009-01-11 14:39:52 +00:00
parent 2e77f3bf04
commit da46e4bd96
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/checkother.cpp
View File

@ -647,15 +647,31 @@ void CheckOther::CheckConstantFunctionParameter()
void CheckOther::CheckStructMemberUsage() void CheckOther::CheckStructMemberUsage()
{ {
const char *structname = 0; const char *structname = 0;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{ {
if (tok->fileIndex() != 0) if (tok->fileIndex() != 0)
continue; continue;
if (Token::Match(tok, "struct|union %type% {"))
{
structname = tok->strAt(1);
// Bail out if struct/union contain any functions
for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next())
{
if (tok2->str() == "(")
{
structname = 0;
break;
}
if (tok2->str() == "}")
break;
}
}
if (tok->str() == "}") if (tok->str() == "}")
structname = 0; structname = 0;
if (Token::Match(tok, "struct|union %type% {"))
structname = tok->strAt(1);
if (structname && Token::Match(tok, "[{;]")) if (structname && Token::Match(tok, "[{;]"))
{ {

23
test/testunusedvar.cpp
View File

@ -57,6 +57,7 @@ private:
TEST_CASE(structmember2); TEST_CASE(structmember2);
TEST_CASE(structmember3); TEST_CASE(structmember3);
TEST_CASE(structmember4); TEST_CASE(structmember4);
TEST_CASE(structmember5);
TEST_CASE(localvar1); TEST_CASE(localvar1);
TEST_CASE(localvar2); TEST_CASE(localvar2);
@ -144,6 +145,28 @@ private:
} }
void structmember5()
{
check("struct AB\n"
"{\n"
" int a;\n"
" int b;\n"
" void reset()\n"
" {\n"
" a = 1;\n"
" b = 2;\n"
" }\n"
"};\n"
"\n"
"void foo()\n"
"{\n"
" struct AB ab;\n"
" ab.reset();\n"
"}\n");
ASSERT_EQUALS(std::string(""), errout.str());
}