Skip to content

Commit b6562a2

Browse files
rvermeulenrvermeulen
committed
Address incorrect format exclusion files
1 parent c2c320a commit b6562a2

24 files changed

+24
-72
lines changed

‎cpp/common/src/codingstandards/cpp/exclusions/c/Banned.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ newtype BannedQuery =
2424
TOctalConstantsUsedQuery() or
2525
TRestrictTypeQualifierUsedQuery()
2626

27-
predicate isBannedQueryMetadata(
28-
Query query, string queryId, string ruleId, string category
29-
) {
27+
predicate isBannedQueryMetadata(Query query, string queryId, string ruleId, string category) {
3028
query =
3129
// `Query` instance for the `doNotCallSystem` query
3230
BannedPackage::doNotCallSystemQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Concurrency1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ newtype Concurrency1Query =
88
TRaceConditionsWhenUsingLibraryFunctionsQuery() or
99
TDoNotCallSignalInMultithreadedProgramQuery()
1010

11-
predicate isConcurrency1QueryMetadata(
12-
Query query, string queryId, string ruleId, string category
13-
) {
11+
predicate isConcurrency1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1412
query =
1513
// `Query` instance for the `preventDataRacesWithMultipleThreads` query
1614
Concurrency1Package::preventDataRacesWithMultipleThreadsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Concurrency2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ newtype Concurrency2Query =
77
TDeadlockByLockingInPredefinedOrderQuery() or
88
TWrapFunctionsThatCanSpuriouslyWakeUpInLoopQuery()
99

10-
predicate isConcurrency2QueryMetadata(
11-
Query query, string queryId, string ruleId, string category
12-
) {
10+
predicate isConcurrency2QueryMetadata(Query query, string queryId, string ruleId, string category) {
1311
query =
1412
// `Query` instance for the `deadlockByLockingInPredefinedOrder` query
1513
Concurrency2Package::deadlockByLockingInPredefinedOrderQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Concurrency3.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ newtype Concurrency3Query =
99
TPreserveSafetyWhenUsingConditionVariablesQuery() or
1010
TWrapFunctionsThatCanFailSpuriouslyInLoopQuery()
1111

12-
predicate isConcurrency3QueryMetadata(
13-
Query query, string queryId, string ruleId, string category
14-
) {
12+
predicate isConcurrency3QueryMetadata(Query query, string queryId, string ruleId, string category) {
1513
query =
1614
// `Query` instance for the `doNotAllowAMutexToGoOutOfScopeWhileLocked` query
1715
Concurrency3Package::doNotAllowAMutexToGoOutOfScopeWhileLockedQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Contracts1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ newtype Contracts1Query =
77
TDoNotModifyTheReturnValueOfCertainFunctionsQuery() or
88
TEnvPointerIsInvalidAfterCertainOperationsQuery()
99

10-
predicate isContracts1QueryMetadata(
11-
Query query, string queryId, string ruleId, string category
12-
) {
10+
predicate isContracts1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1311
query =
1412
// `Query` instance for the `doNotModifyTheReturnValueOfCertainFunctions` query
1513
Contracts1Package::doNotModifyTheReturnValueOfCertainFunctionsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Declarations1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ newtype Declarations1Query =
1111
TMacroIdentifiersNotDistinctQuery() or
1212
TMacroIdentifierNotDistinctFromParameterQuery()
1313

14-
predicate isDeclarations1QueryMetadata(
15-
Query query, string queryId, string ruleId, string category
16-
) {
14+
predicate isDeclarations1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1715
query =
1816
// `Query` instance for the `declareIdentifiersBeforeUsingThem` query
1917
Declarations1Package::declareIdentifiersBeforeUsingThemQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Expressions.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ newtype ExpressionsQuery =
99
TCallPOSIXOpenWithCorrectArgumentCountQuery() or
1010
TDoNotUseABitwiseOperatorWithABooleanLikeOperandQuery()
1111

12-
predicate isExpressionsQueryMetadata(
13-
Query query, string queryId, string ruleId, string category
14-
) {
12+
predicate isExpressionsQueryMetadata(Query query, string queryId, string ruleId, string category) {
1513
query =
1614
// `Query` instance for the `doNotCallFunctionPointerWithIncompatibleType` query
1715
ExpressionsPackage::doNotCallFunctionPointerWithIncompatibleTypeQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/IO1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ newtype IO1Query =
1212
TUndefinedBehaviorAccessingAClosedFileQuery() or
1313
TFileUsedAfterClosedQuery()
1414

15-
predicate isIO1QueryMetadata(
16-
Query query, string queryId, string ruleId, string category
17-
) {
15+
predicate isIO1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1816
query =
1917
// `Query` instance for the `excludeUserInputFromFormatStrings` query
2018
IO1Package::excludeUserInputFromFormatStringsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/IO2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ newtype IO2Query =
99
TDoNotCallGetcAndPutcWithSideEffectsQuery() or
1010
TOnlyUseValuesForFsetposThatAreReturnedFromFgetposQuery()
1111

12-
predicate isIO2QueryMetadata(
13-
Query query, string queryId, string ruleId, string category
14-
) {
12+
predicate isIO2QueryMetadata(Query query, string queryId, string ruleId, string category) {
1513
query =
1614
// `Query` instance for the `doNotCopyAFileObject` query
1715
IO2Package::doNotCopyAFileObjectQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/IO3.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ newtype IO3Query =
1111
TPointerToAFileObjectDereferencedQuery() or
1212
TEofShallBeComparedWithUnmodifiedReturnValuesQuery()
1313

14-
predicate isIO3QueryMetadata(
15-
Query query, string queryId, string ruleId, string category
16-
) {
14+
predicate isIO3QueryMetadata(Query query, string queryId, string ruleId, string category) {
1715
query =
1816
// `Query` instance for the `doNotPerformFileOperationsOnDevices` query
1917
IO3Package::doNotPerformFileOperationsOnDevicesQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Misc.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ newtype MiscQuery =
88
TProperlySeedPseudorandomNumberGeneratorsQuery() or
99
TControlFlowReachesTheEndOfANonVoidFunctionQuery()
1010

11-
predicate isMiscQueryMetadata(
12-
Query query, string queryId, string ruleId, string category
13-
) {
11+
predicate isMiscQueryMetadata(Query query, string queryId, string ruleId, string category) {
1412
query =
1513
// `Query` instance for the `randUsedForGeneratingPseudorandomNumbers` query
1614
MiscPackage::randUsedForGeneratingPseudorandomNumbersQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Pointers1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ newtype Pointers1Query =
2222
TObjectWithNoPointerDereferenceShouldBeOpaqueQuery() or
2323
TPointerShouldPointToConstTypeWhenPossibleQuery()
2424

25-
predicate isPointers1QueryMetadata(
26-
Query query, string queryId, string ruleId, string category
27-
) {
25+
predicate isPointers1QueryMetadata(Query query, string queryId, string ruleId, string category) {
2826
query =
2927
// `Query` instance for the `conversionBetweenFunctionPointerAndOtherType` query
3028
Pointers1Package::conversionBetweenFunctionPointerAndOtherTypeQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Pointers2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
55

66
newtype Pointers2Query = TDoNotAddOrSubtractAScaledIntegerToAPointerQuery()
77

8-
predicate isPointers2QueryMetadata(
9-
Query query, string queryId, string ruleId, string category
10-
) {
8+
predicate isPointers2QueryMetadata(Query query, string queryId, string ruleId, string category) {
119
query =
1210
// `Query` instance for the `doNotAddOrSubtractAScaledIntegerToAPointer` query
1311
Pointers2Package::doNotAddOrSubtractAScaledIntegerToAPointerQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Preprocessor1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ newtype Preprocessor1Query =
99
TForbiddenCharactersInHeaderFileNameQuery() or
1010
TIdentifiersUsedInPreprocessorExpressionQuery()
1111

12-
predicate isPreprocessor1QueryMetadata(
13-
Query query, string queryId, string ruleId, string category
14-
) {
12+
predicate isPreprocessor1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1513
query =
1614
// `Query` instance for the `includeDirectivesPrecededByDirectivesOrComments` query
1715
Preprocessor1Package::includeDirectivesPrecededByDirectivesOrCommentsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Preprocessor2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ newtype Preprocessor2Query =
99
TUndefShouldNotBeUsedQuery() or
1010
TPrecautionIncludeGuardsNotProvidedQuery()
1111

12-
predicate isPreprocessor2QueryMetadata(
13-
Query query, string queryId, string ruleId, string category
14-
) {
12+
predicate isPreprocessor2QueryMetadata(Query query, string queryId, string ruleId, string category) {
1513
query =
1614
// `Query` instance for the `moreThanOneHashOperatorInMacroDefinition` query
1715
Preprocessor2Package::moreThanOneHashOperatorInMacroDefinitionQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Preprocessor3.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
55

66
newtype Preprocessor3Query = TControllingExpressionIfDirectiveQuery()
77

8-
predicate isPreprocessor3QueryMetadata(
9-
Query query, string queryId, string ruleId, string category
10-
) {
8+
predicate isPreprocessor3QueryMetadata(Query query, string queryId, string ruleId, string category) {
119
query =
1210
// `Query` instance for the `controllingExpressionIfDirective` query
1311
Preprocessor3Package::controllingExpressionIfDirectiveQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Preprocessor4.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ newtype Preprocessor4Query =
88
TFunctionLikeMacroArgsContainHashTokenCQueryQuery() or
99
TDefineAndUndefUsedOnReservedIdentifierOrMacroNameQuery()
1010

11-
predicate isPreprocessor4QueryMetadata(
12-
Query query, string queryId, string ruleId, string category
13-
) {
11+
predicate isPreprocessor4QueryMetadata(Query query, string queryId, string ruleId, string category) {
1412
query =
1513
// `Query` instance for the `macroDefinedWithTheSameNameAsKeyword` query
1614
Preprocessor4Package::macroDefinedWithTheSameNameAsKeywordQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Preprocessor5.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ newtype Preprocessor5Query =
88
TMacroOrFunctionArgsContainHashTokenQuery() or
99
TMacroParameterNotEnclosedInParenthesesCQueryQuery()
1010

11-
predicate isPreprocessor5QueryMetadata(
12-
Query query, string queryId, string ruleId, string category
13-
) {
11+
predicate isPreprocessor5QueryMetadata(Query query, string queryId, string ruleId, string category) {
1412
query =
1513
// `Query` instance for the `doNotTreatAPredefinedIdentifierAsObject` query
1614
Preprocessor5Package::doNotTreatAPredefinedIdentifierAsObjectQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/SideEffects1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ newtype SideEffects1Query =
1515
TPossibleSuppressedSideEffectInLogicOperatorOperandQuery() or
1616
TSizeofOperandWithSideEffectQuery()
1717

18-
predicate isSideEffects1QueryMetadata(
19-
Query query, string queryId, string ruleId, string category
20-
) {
18+
predicate isSideEffects1QueryMetadata(Query query, string queryId, string ruleId, string category) {
2119
query =
2220
// `Query` instance for the `dependenceOnOrderOfScalarEvaluationForSideEffects` query
2321
SideEffects1Package::dependenceOnOrderOfScalarEvaluationForSideEffectsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/SideEffects2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ newtype SideEffects2Query =
77
TSideEffectAndCrementInFullExpressionQuery() or
88
TModificationOfFunctionParameterQuery()
99

10-
predicate isSideEffects2QueryMetadata(
11-
Query query, string queryId, string ruleId, string category
12-
) {
10+
predicate isSideEffects2QueryMetadata(Query query, string queryId, string ruleId, string category) {
1311
query =
1412
// `Query` instance for the `sideEffectAndCrementInFullExpression` query
1513
SideEffects2Package::sideEffectAndCrementInFullExpressionQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Strings1.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ newtype Strings1Query =
88
TStringsHasSufficientSpaceForTheNullTerminatorQuery() or
99
TNonNullTerminatedToFunctionThatExpectsAStringQuery()
1010

11-
predicate isStrings1QueryMetadata(
12-
Query query, string queryId, string ruleId, string category
13-
) {
11+
predicate isStrings1QueryMetadata(Query query, string queryId, string ruleId, string category) {
1412
query =
1513
// `Query` instance for the `doNotAttemptToModifyStringLiterals` query
1614
Strings1Package::doNotAttemptToModifyStringLiteralsQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Strings2.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
55

66
newtype Strings2Query = TToCharacterHandlingFunctionsRepresentableAsUCharQuery()
77

8-
predicate isStrings2QueryMetadata(
9-
Query query, string queryId, string ruleId, string category
10-
) {
8+
predicate isStrings2QueryMetadata(Query query, string queryId, string ruleId, string category) {
119
query =
1210
// `Query` instance for the `toCharacterHandlingFunctionsRepresentableAsUChar` query
1311
Strings2Package::toCharacterHandlingFunctionsRepresentableAsUCharQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Strings3.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ newtype Strings3Query =
77
TCastCharBeforeConvertingToLargerSizesQuery() or
88
TDoNotConfuseNarrowAndWideFunctionsQuery()
99

10-
predicate isStrings3QueryMetadata(
11-
Query query, string queryId, string ruleId, string category
12-
) {
10+
predicate isStrings3QueryMetadata(Query query, string queryId, string ruleId, string category) {
1311
query =
1412
// `Query` instance for the `castCharBeforeConvertingToLargerSizes` query
1513
Strings3Package::castCharBeforeConvertingToLargerSizesQuery() and

‎cpp/common/src/codingstandards/cpp/exclusions/c/Syntax.qll

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ newtype SyntaxQuery =
1212
TUOrUSuffixRepresentedInUnsignedTypeQuery() or
1313
TLowercaseCharacterLUsedInLiteralSuffixQuery()
1414

15-
predicate isSyntaxQueryMetadata(
16-
Query query, string queryId, string ruleId, string category
17-
) {
15+
predicate isSyntaxQueryMetadata(Query query, string queryId, string ruleId, string category) {
1816
query =
1917
// `Query` instance for the `characterSequencesAndUsedWithinAComment` query
2018
SyntaxPackage::characterSequencesAndUsedWithinACommentQuery() and

0 commit comments

Comments
 (0)