From 3259d17e5d699628303d64f0d52345d0f62eaeca Mon Sep 17 00:00:00 2001
From: Mike Fairhurst <michaelrfairhurst@github.com>
Date: Thu, 31 Oct 2024 21:53:43 -0700
Subject: [PATCH] Fix query formatting

---
 .../DIR-5-2/NotNoDeadlocksBetweenThreads.ql      |  3 ++-
 .../src/rules/DIR-5-3/ThreadCreatedByThread.ql   |  2 +-
 .../RULE-21-25/InvalidMemoryOrderArgument.ql     | 16 ++++++----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
index ffe30a2b6a..5d949f56ed 100644
--- a/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
+++ b/c/misra/src/rules/DIR-5-2/NotNoDeadlocksBetweenThreads.ql
@@ -17,7 +17,8 @@ import cpp
 import codingstandards.c.misra
 import codingstandards.cpp.rules.preventdeadlockbylockinginpredefinedorder.PreventDeadlockByLockingInPredefinedOrder
 
-class NotNoDeadlocksBetweenThreadsQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery {
+class NotNoDeadlocksBetweenThreadsQuery extends PreventDeadlockByLockingInPredefinedOrderSharedQuery
+{
   NotNoDeadlocksBetweenThreadsQuery() {
     this = Concurrency6Package::notNoDeadlocksBetweenThreadsQuery()
   }
diff --git a/c/misra/src/rules/DIR-5-3/ThreadCreatedByThread.ql b/c/misra/src/rules/DIR-5-3/ThreadCreatedByThread.ql
index cf08a0c809..25b8b4cb9f 100644
--- a/c/misra/src/rules/DIR-5-3/ThreadCreatedByThread.ql
+++ b/c/misra/src/rules/DIR-5-3/ThreadCreatedByThread.ql
@@ -42,4 +42,4 @@ where
   enclosingFunction = tc.getEnclosingFunction() and
   threadRoot = enclosingFunction.getThreadRoot()
 select tc, "Thread creation call reachable from threaded function '$@'.", threadRoot,
-  threadRoot.toString()
\ No newline at end of file
+  threadRoot.toString()
diff --git a/c/misra/src/rules/RULE-21-25/InvalidMemoryOrderArgument.ql b/c/misra/src/rules/RULE-21-25/InvalidMemoryOrderArgument.ql
index 4924c0df33..b0945db559 100644
--- a/c/misra/src/rules/RULE-21-25/InvalidMemoryOrderArgument.ql
+++ b/c/misra/src/rules/RULE-21-25/InvalidMemoryOrderArgument.ql
@@ -40,18 +40,13 @@ class MemoryOrderConstantExpr extends Expr {
   MemoryOrder ord;
 
   MemoryOrderConstantExpr() {
-    if
-    this instanceof MemoryOrderConstantAccess
-    then
-    ord = this.(MemoryOrderConstantAccess).getTarget()
-    else
-    ord.getIntValue() = getValue().toInt()
+    if this instanceof MemoryOrderConstantAccess
+    then ord = this.(MemoryOrderConstantAccess).getTarget()
+    else ord.getIntValue() = getValue().toInt()
   }
 
   /* Get the name of the `MemoryOrder` this expression is valued as. */
-  string getMemoryOrderString() {
-    result = ord.toString()
-  }
+  string getMemoryOrderString() { result = ord.toString() }
 }
 
 /**
@@ -75,7 +70,8 @@ class MemoryOrderedStdAtomicFunction extends Function {
         baseParamIdx = 1 and
         baseParams = 2
         or
-        getName().regexpMatch(prefix + ["atomic_store", "atomic_fetch_.*", "atomic_exchange"] + suffix) and
+        getName()
+            .regexpMatch(prefix + ["atomic_store", "atomic_fetch_.*", "atomic_exchange"] + suffix) and
         baseParamIdx = 2 and
         baseParams = 3
         or