Query formatting

Author: MichaelRFairhurst

c/cert/src/rules/CON34-C/AppropriateThreadObjectStorageDurations.ql

@@ -32,7 +32,8 @@ where
         (
           addrNode = DataFlow::exprNode(any(AddressOfExpr e | e.getOperand() = acc))
           or
-          addrNode = DataFlow::exprNode(acc) and exists(ArrayToPointerConversion c | c.getExpr() = acc)
+          addrNode = DataFlow::exprNode(acc) and
+          exists(ArrayToPointerConversion c | c.getExpr() = acc)
         ) and
         TaintTracking::localTaint(addrNode, DataFlow::exprNode(arg))
       )

c/cert/src/rules/DCL30-C/AppropriateStorageDurationsFunctionReturn.ql

@@ -18,9 +18,10 @@ import codingstandards.cpp.dataflow.DataFlow
 
 class Source extends Expr {
   ObjectIdentity rootObject;
+
   Source() {
-    rootObject.getStorageDuration().isAutomatic()
-    and this = rootObject.getASubobjectAddressExpr()
+    rootObject.getStorageDuration().isAutomatic() and
+    this = rootObject.getASubobjectAddressExpr()
   }
 }
 

c/cert/src/rules/MEM33-C/AllocStructsWithAFlexibleArrayMemberDynamically.ql

@@ -62,14 +62,15 @@ class FlexibleArrayStructDynamicAlloc extends FlexibleArrayAlloc, FunctionCall {
  */
 class FlexibleArrayNonDynamicAlloc extends FlexibleArrayAlloc {
   ObjectIdentity object;
+
   FlexibleArrayNonDynamicAlloc() {
     this = object and
     not object.getStorageDuration().isAllocated() and
     // Exclude temporaries. Though they should violate this rule, in practice these results are
     // often spurious and redundant, such as (*x = *x) which creates an unused temporary object.
     not object.hasTemporaryLifetime() and
-    object.getType().getUnspecifiedType() instanceof FlexibleArrayStructType
-    and not exists(Variable v | v.getInitializer().getExpr() = this)
+    object.getType().getUnspecifiedType() instanceof FlexibleArrayStructType and
+    not exists(Variable v | v.getInitializer().getExpr() = this)
   }
 
   override Element getReportElement() { result = object }

c/common/src/codingstandards/c/UninitializedMutex.qll

@@ -2,4 +2,4 @@ import codingstandards.c.Objects
 
 from ObjectIdentity obj
 where obj.getFile().getBaseName() = "objectidentity.c"
-select obj, obj.getStorageDuration(), obj.getType()
+select obj, obj.getStorageDuration(), obj.getType()

c/common/test/library/objects/ObjectIdentity.ql

@@ -58,9 +58,7 @@ Expr temporaryObjectFlowStep(Expr e) {
   e = result.(ConditionalExpr).getElse()
 }
 
-from
-  FieldAccess fa, TemporaryObjectIdentity temporary,
-  ArrayToPointerConversion conversion
+from FieldAccess fa, TemporaryObjectIdentity temporary, ArrayToPointerConversion conversion
 where
   not isExcluded(conversion, InvalidMemory3Package::arrayToPointerConversionOfTemporaryObjectQuery()) and
   fa = temporary.getASubobjectAccess() and

c/misra/src/rules/RULE-18-9/ArrayToPointerConversionOfTemporaryObject.ql

@@ -26,7 +26,9 @@ predicate usedAsModifiableLvalue(Expr expr, Boolean allowArrayAccess) {
   exists(AddressOfExpr parent | parent.getOperand() = expr)
   or
   // Don't report `x.y[0].m[0]++` twice. Recurse with `allowArrayAccess` set to false.
-  exists(FieldAccess parent | parent.getQualifier() = expr and usedAsModifiableLvalue(parent, false))
+  exists(FieldAccess parent |
+    parent.getQualifier() = expr and usedAsModifiableLvalue(parent, false)
+  )
   or
   allowArrayAccess = true and
   exists(ArrayExpr parent | parent.getArrayBase() = expr and usedAsModifiableLvalue(parent, true))

c/misra/src/rules/RULE-18-9/ModifiableLValueSubscriptedWithTemporaryLifetime.ql

@@ -22,6 +22,5 @@ from C11MutexSource mutexCreate, ThreadedFunction thread
 where
   not isExcluded(mutexCreate, Concurrency8Package::mutexInitializedInsideThreadQuery()) and
   thread.calls*(mutexCreate.getEnclosingFunction())
-select
-mutexCreate, "Mutex initialization reachable from threaded function '$@'.",
-thread, thread.getName()
+select mutexCreate, "Mutex initialization reachable from threaded function '$@'.", thread,
+  thread.getName()

c/misra/src/rules/RULE-22-14/MutexInitializedInsideThread.ql

@@ -50,6 +50,7 @@ class ThreadObjectInitialization extends FunctionCall {
 class ThreadObjectUse extends Expr {
   ObjectIdentity owningObject;
   string typeString;
+
   ThreadObjectUse() {
     owningObject.getASubobjectAddressExpr() = this and
     (
@@ -78,7 +79,6 @@ class ThreadObjectUse extends Expr {
   }
 }
 
-
 predicate requiresInitializedMutexObject(
   Function func, ThreadObjectUse mutexUse, ObjectIdentity owningObject
 ) {