Skip to content

Commit e8f02b3

Browse files
Fix Bugs caught by @mbaluda
1 parent ce6c326 commit e8f02b3

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

cpp/misra/src/rules/RULE-0-2-1/UnusedLimitedVisibilityVariable.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class UnusedVariable extends Variable {
3333
description = "Variable '" + this.getName() + "' is unused."
3434
or
3535
this instanceof FullyUnusedMemberVariable and
36-
description = "Member variable '" + this.getQualifiedName() + "' is unused."
36+
description = "Member variable '" + this.getName() + "' is unused."
3737
) and
3838
not (isConstant(this) and this.getFile() instanceof HeaderFile and hasNamespaceScope(this))
3939
}

cpp/misra/test/rules/RULE-0-2-1/UnusedLimitedVisibilityVariable.expected

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
| test_global_or_namespace.cpp:29:4:29:4 | a | Variable '(unnamed namespace)::a' is unused. |
1111
| test_global_or_namespace.cpp:37:5:37:6 | x3 | Variable '(unnamed namespace)::N1::x3' is unused. |
1212
| test_global_or_namespace.cpp:47:5:47:5 | a | Variable '(unnamed namespace)::N1::a' is unused. |
13-
| test_header.hpp:22:13:22:14 | m1 | Member variable 'HeaderClass::m1' is unused. |
14-
| test_member.cpp:4:7:4:8 | m1 | Member variable 'test::A::m1' is unused. |
15-
| test_member.cpp:31:7:31:8 | m1 | Member variable 'test::C::m1' is unused. |
13+
| test_header.hpp:22:13:22:14 | m1 | Member variable 'm1' is unused. |
14+
| test_header.hpp:28:20:28:21 | m1 | Member variable 'm1' is unused. |
15+
| test_member.cpp:4:7:4:8 | m1 | Member variable 'm1' is unused. |
16+
| test_member.cpp:17:9:17:11 | pad | Member variable 'pad' is unused. |
17+
| test_member.cpp:19:9:19:11 | sm2 | Member variable 'sm2' is unused. |
18+
| test_member.cpp:31:7:31:8 | m1 | Member variable 'm1' is unused. |

cpp/misra/test/rules/RULE-0-2-1/test_header.hpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ const int cg8 = 8; // COMPLIANT - unused constant variable defined in header
1919
}
2020

2121
class HeaderClass {
22-
const int m1 = 9; // NON_COMPLIANT -- not namespace scope
23-
static const int m2 = 30234; // NON_COMPLIANT -- not namespace scope
24-
};
22+
const int m1 = 9; // NON_COMPLIANT -- no linkage
23+
static const int m2 = 30234; // COMPLIANT -- external linkage
24+
};
25+
26+
namespace {
27+
class HeaderClass2 {
28+
static const int m1 =
29+
9; // NON_COMPLIANT -- internal linkage, not namespace scope
30+
};
31+
} // namespace

0 commit comments

Comments
 (0)