Skip to content
Merged
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
2 changes: 1 addition & 1 deletion lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2560,7 +2560,7 @@ void Variable::evaluate(const Settings& settings)
bool isContainer = false;
if (mNameToken) {
setFlag(fIsArray, arrayDimensions(settings, isContainer));
setFlag(fIsMaybeUnused, mNameToken->isAttributeMaybeUnused());
setFlag(fIsMaybeUnused, mNameToken->isAttributeMaybeUnused() || mNameToken->isAttributeUnused());
}


Expand Down
4 changes: 2 additions & 2 deletions lib/tokenize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9718,8 +9718,8 @@ static Token* getVariableTokenAfterAttributes(Token* tok) {
Token *vartok = nullptr;
Token *after = getTokenAfterAttributes(tok, true);

// check if after variable name
if (Token::Match(after, "[;={]")) {
// check if after variable or parameter name
if (Token::Match(after, "[;={,)]")) {
Comment thread
mptre marked this conversation as resolved.
Resolved
Token *prev = tok->previous();
while (Token::simpleMatch(prev, "]"))
prev = prev->link()->previous();
Expand Down
5 changes: 5 additions & 0 deletions test/testother.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5039,6 +5039,11 @@ class TestOther : public TestFixture {
"};\n");
ASSERT_EQUALS("[test.cpp:2:17]: (style) Either there is a missing override/final keyword, or the parameter 'p' can be declared as pointer to const [constParameterPointer]\n",
errout_str());

check("void f(int *p __attribute__((unused))) {}\n"
"void g(__attribute__((unused)) int *p) {}\n"
"void h(int *p) {}\n");
ASSERT_EQUALS("[test.cpp:3:13]: (style) Parameter 'p' can be declared as pointer to const [constParameterPointer]\n", errout_str());
}

void constArray() {
Expand Down
11 changes: 11 additions & 0 deletions test/testunusedvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2068,6 +2068,11 @@ class TestUnusedVar : public TestFixture {
" int i3 __attribute__((unused)) {};\n"
"};\n");
ASSERT_EQUALS("", errout_str());

checkStructMemberUsage("struct S {\n"
" int a __attribute__((unused)), b;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2:36]: (style) struct member 'S::b' is never used. [unusedStructMember]\n", errout_str());
}

void structmember31() { // #14130
Expand Down Expand Up @@ -6015,6 +6020,12 @@ class TestUnusedVar : public TestFixture {
" char b[1][2] __attribute__((unused));\n"
"}\n");
ASSERT_EQUALS("", errout_str());

functionVariableUsage("int foo()\n"
"{\n"
" int x __attribute__((unused)), y;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3:36]: (style) Unused variable: y [unusedVariable]\n", errout_str());
}

void localvarFunction() {
Expand Down
Loading