Update metadata

Author: mbaluda

c/cert/src/rules/ERR33-C/DetectAndHandleStandardLibraryErrors.md

@@ -372,7 +372,7 @@ Independent( ERR33-C, POS54-C, FLP32-C, ERR34-C) Intersection( CWE-252, CWE-253)
 
 ## Implementation notes
 
-None
+The rule is enforced in the context of a single function.
 
 ## References
 

c/cert/test/rules/ERR33-C/test.c

@@ -125,7 +125,7 @@ void f4() {
   if (strtoumax("", &endptr, 0) == UINTMAX_MAX) { // COMPLIANT
   }
   if (strtoull("", &endptr, 0) == ULONG_MAX) { // NON_COMPLIANT
-  // =ULLONG_MAX not present in the test DB
+    // =ULLONG_MAX not present in the test DB
   }
   if (strtoul("", &endptr, 0) == ULONG_MAX) { // COMPLIANT
   }

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

@@ -7,22 +7,24 @@ newtype Contracts5Query =
   TDoNotRelyOnIndeterminateValuesOfErrnoQuery() or
   TDetectAndHandleStandardLibraryErrorsQuery()
 
-predicate isContracts5QueryMetadata(Query query, string queryId, string ruleId) {
+predicate isContracts5QueryMetadata(Query query, string queryId, string ruleId, string category) {
   query =
     // `Query` instance for the `doNotRelyOnIndeterminateValuesOfErrno` query
     Contracts5Package::doNotRelyOnIndeterminateValuesOfErrnoQuery() and
   queryId =
     // `@id` for the `doNotRelyOnIndeterminateValuesOfErrno` query
     "c/cert/do-not-rely-on-indeterminate-values-of-errno" and
-  ruleId = "ERR32-C"
+  ruleId = "ERR32-C" and
+  category = "rule"
   or
   query =
     // `Query` instance for the `detectAndHandleStandardLibraryErrors` query
     Contracts5Package::detectAndHandleStandardLibraryErrorsQuery() and
   queryId =
     // `@id` for the `detectAndHandleStandardLibraryErrors` query
     "c/cert/detect-and-handle-standard-library-errors" and
-  ruleId = "ERR33-C"
+  ruleId = "ERR33-C" and
+  category = "rule"
 }
 
 module Contracts5Package {

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

@@ -90,7 +90,7 @@ predicate isQueryMetadata(Query query, string queryId, string ruleId, string cat
   isContracts2QueryMetadata(query, queryId, ruleId, category) or
   isContracts3QueryMetadata(query, queryId, ruleId, category) or
   isContracts4QueryMetadata(query, queryId, ruleId, category) or
-  isContracts5QueryMetadata(query, queryId, ruleId) or
+  isContracts5QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations1QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations2QueryMetadata(query, queryId, ruleId, category) or
   isDeclarations3QueryMetadata(query, queryId, ruleId, category) or