Rule 21.10.1 - Formatting and reporting improvements

Author: lcartey

cpp/misra/src/rules/RULE-21-10-1/NoVariadicFunctionMacros.ql

@@ -18,7 +18,6 @@ import codingstandards.cpp.misra
 class VaListType extends Type {
   VaListType() {
     this.getName() = "va_list" or
-    this.getName() = "__va_list_tag" or
     this.(SpecifiedType).getBaseType() instanceof VaListType or
     this.(TypedefType).getBaseType() instanceof VaListType
   }
@@ -29,10 +28,15 @@ where
   not isExcluded(element, BannedAPIsPackage::noVariadicFunctionMacrosQuery()) and
   (
     element.(Variable).getType() instanceof VaListType and
-    message = "Declaration of variable '" + element.(Variable).getName() + "' of type 'va_list'."
-    or
-    element.(Parameter).getType() instanceof VaListType and
-    message = "Declaration of parameter '" + element.(Parameter).getName() + "' of type 'va_list'."
+    (
+      if element instanceof Parameter
+      then
+        message =
+          "Declaration of parameter '" + element.(Parameter).getName() + "' of type 'va_list'."
+      else
+        message =
+          "Declaration of variable '" + element.(Variable).getName() + "' of type 'va_list'."
+    )
     or
     element instanceof BuiltInVarArgsStart and
     message = "Call to 'va_start'."
@@ -50,4 +54,4 @@ where
     message =
       "Declaration of typedef '" + element.(TypedefType).getName() + "' aliasing 'va_list' type."
   )
-select element, message
+select element, message

cpp/misra/test/rules/RULE-21-10-1/NoVariadicFunctionMacros.expected

@@ -16,7 +16,6 @@
 | test.cpp:31:3:31:12 | __builtin_va_end | Call to 'va_end'. |
 | test.cpp:32:3:32:12 | __builtin_va_end | Call to 'va_end'. |
 | test.cpp:35:37:35:38 | l1 | Declaration of parameter 'l1' of type 'va_list'. |
-| test.cpp:35:37:35:38 | l1 | Declaration of variable 'l1' of type 'va_list'. |
 | test.cpp:36:15:36:32 | __builtin_va_arg | Call to 'va_arg'. |
 | test.cpp:40:11:40:12 | l2 | Declaration of variable 'l2' of type 'va_list'. |
 | test.cpp:41:3:41:18 | __builtin_va_start | Call to 'va_start'. |