Declarations4: fix rule metadata files

Author: knewbury01

cpp/common/src/codingstandards/cpp/exclusions/c/Declarations4.qll

@@ -11,54 +11,60 @@ newtype Declarations4Query =
   TCompatibleDeclarationFunctionDefinedQuery() or
   TIdentifierWithExternalLinkageOneDefinitionQuery()
 
-predicate isDeclarations4QueryMetadata(Query query, string queryId, string ruleId) {
+predicate isDeclarations4QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
     // `Query` instance for the `functionTypesNotInPrototypeForm` query
     Declarations4Package::functionTypesNotInPrototypeFormQuery() and
   queryId =
     // `@id` for the `functionTypesNotInPrototypeForm` query
     "c/misra/function-types-not-in-prototype-form" and
-  ruleId = "RULE-8-2"
+  ruleId = "RULE-8-2" and
+  category = "required"
   or
   query =
     // `Query` instance for the `declarationsOfAnObjectSameNameAndType` query
     Declarations4Package::declarationsOfAnObjectSameNameAndTypeQuery() and
   queryId =
     // `@id` for the `declarationsOfAnObjectSameNameAndType` query
     "c/misra/declarations-of-an-object-same-name-and-type" and
-  ruleId = "RULE-8-3"
+  ruleId = "RULE-8-3" and
+  category = "required"
   or
   query =
     // `Query` instance for the `declarationsOfAFunctionSameNameAndType` query
     Declarations4Package::declarationsOfAFunctionSameNameAndTypeQuery() and
   queryId =
     // `@id` for the `declarationsOfAFunctionSameNameAndType` query
     "c/misra/declarations-of-a-function-same-name-and-type" and
-  ruleId = "RULE-8-3"
+  ruleId = "RULE-8-3" and
+  category = "required"
   or
   query =
     // `Query` instance for the `compatibleDeclarationObjectDefined` query
     Declarations4Package::compatibleDeclarationObjectDefinedQuery() and
   queryId =
     // `@id` for the `compatibleDeclarationObjectDefined` query
     "c/misra/compatible-declaration-object-defined" and
-  ruleId = "RULE-8-4"
+  ruleId = "RULE-8-4" and
+  category = "required"
   or
   query =
     // `Query` instance for the `compatibleDeclarationFunctionDefined` query
     Declarations4Package::compatibleDeclarationFunctionDefinedQuery() and
   queryId =
     // `@id` for the `compatibleDeclarationFunctionDefined` query
     "c/misra/compatible-declaration-function-defined" and
-  ruleId = "RULE-8-4"
+  ruleId = "RULE-8-4" and
+  category = "required"
   or
   query =
     // `Query` instance for the `identifierWithExternalLinkageOneDefinition` query
     Declarations4Package::identifierWithExternalLinkageOneDefinitionQuery() and
   queryId =
     // `@id` for the `identifierWithExternalLinkageOneDefinition` query
     "c/misra/identifier-with-external-linkage-one-definition" and
-  ruleId = "RULE-8-6"
+  ruleId = "RULE-8-6" and
+  category = "required"
 }
 
 module Declarations4Package {

cpp/common/src/codingstandards/cpp/exclusions/c/RuleMetadata.qll

@@ -93,7 +93,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isDeclarations1QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations2QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations3QueryMetadata(query, queryId, ruleId, category) or
-  isDeclarations4QueryMetadata(query, queryId, ruleId) or
+  isDeclarations4QueryMetadata(query, queryId, ruleId, category) or
   isExpressionsQueryMetadata(query, queryId, ruleId, category) or
   isIO1QueryMetadata(query, queryId, ruleId, category) or
   isIO2QueryMetadata(query, queryId, ruleId, category) or