Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/checkunusedvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,9 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
Variables::VariableUsage *var1 = variables.find(varid1);

if (var1) {
if (var1->mType == Variables::pointerArray)
variables.use(varid1, tok);

// jump behind '='
tok = tok->next();
while (!tok->isAssignmentOp()) {
Expand Down Expand Up @@ -567,8 +570,10 @@ static const Token* doAssignment(Variables &variables, const Token *tok, bool de
} else if (var1->mType == Variables::standard && addressOf) {
variables.alias(varid1, varid2, true);
} else {
if ((var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) && tok->strAt(1) == "[")
if (var2->mType == Variables::pointer || var2->mType == Variables::pointerArray) {
variables.alias(varid1, varid2, true);
variables.readAliases(varid2, tok);
}

variables.read(varid2, tok);
}
Expand Down Expand Up @@ -1393,7 +1398,6 @@ void CheckUnusedVar::checkFunctionVariableUsage()

// skip things that are only partially implemented to prevent false positives
if (usage.mType == Variables::pointerPointer ||
usage.mType == Variables::pointerArray ||
usage.mType == Variables::referenceArray)
continue;

Expand Down
8 changes: 4 additions & 4 deletions test/testunusedvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2876,25 +2876,25 @@ class TestUnusedVar : public TestFixture {
"{\n"
" int * i[2];\n"
"}");
TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
ASSERT_EQUALS("[test.cpp:3:11]: (style) Unused variable: i [unusedVariable]\n", errout_str());

functionVariableUsage("void foo()\n"
"{\n"
" const int * i[2];\n"
"}");
TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
ASSERT_EQUALS("[test.cpp:3:17]: (style) Unused variable: i [unusedVariable]\n", errout_str());

functionVariableUsage("void foo()\n"
"{\n"
" void * i[2];\n"
"}");
TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
ASSERT_EQUALS("[test.cpp:3:12]: (style) Unused variable: i [unusedVariable]\n", errout_str());

functionVariableUsage("void foo()\n"
"{\n"
" const void * i[2];\n"
"}");
TODO_ASSERT_EQUALS("[test.cpp:3:9]: (style) Unused variable: i [unusedVariable]\n", "", errout_str());
ASSERT_EQUALS("[test.cpp:3:18]: (style) Unused variable: i [unusedVariable]\n", errout_str());

functionVariableUsage("void foo()\n"
"{\n"
Expand Down
Loading