Fix format issues caught by clang-format-18

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>

Author: henrybear327

src/rv32_template.c

@@ -119,10 +119,7 @@
  */
 
 /* Internal */
-RVOP(
-    nop,
-    { rv->X[rv_reg_zero] = 0; },
-    GEN({/* no operation */}))
+RVOP(nop, { rv->X[rv_reg_zero] = 0; }, GEN({/* no operation */}))
 
 /* LUI is used to build 32-bit constants and uses the U-type format. LUI
  * places the U-immediate value in the top 20 bits of the destination
@@ -297,13 +294,14 @@ RVOP(
         if (!untaken)                                              \
             goto nextop;                                           \
         IIF(RV32_HAS(JIT))                                         \
-        ({                                                         \
-            cache_get(rv->block_cache, PC + 4, true);              \
-            if (!set_add(&pc_set, PC + 4))                         \
-                has_loops = true;                                  \
-            if (cache_hot(rv->block_cache, PC + 4))                \
-                goto nextop;                                       \
-        }, );                                                      \
+        (                                                          \
+            {                                                      \
+                cache_get(rv->block_cache, PC + 4, true);          \
+                if (!set_add(&pc_set, PC + 4))                     \
+                    has_loops = true;                              \
+                if (cache_hot(rv->block_cache, PC + 4))            \
+                    goto nextop;                                   \
+            }, );                                                  \
         PC += 4;                                                   \
         last_pc = PC;                                              \
         MUST_TAIL return untaken->impl(rv, untaken, cycle, PC);    \
@@ -316,13 +314,14 @@ RVOP(
     struct rv_insn *taken = ir->branch_taken;                      \
     if (taken) {                                                   \
         IIF(RV32_HAS(JIT))                                         \
-        ({                                                         \
-            cache_get(rv->block_cache, PC, true);                  \
-            if (!set_add(&pc_set, PC))                             \
-                has_loops = true;                                  \
-            if (cache_hot(rv->block_cache, PC))                    \
-                goto end_op;                                       \
-        }, );                                                      \
+        (                                                          \
+            {                                                      \
+                cache_get(rv->block_cache, PC, true);              \
+                if (!set_add(&pc_set, PC))                         \
+                    has_loops = true;                              \
+                if (cache_hot(rv->block_cache, PC))                \
+                    goto end_op;                                   \
+            }, );                                                  \
         last_pc = PC;                                              \
         MUST_TAIL return taken->impl(rv, taken, cycle, PC);        \
     }                                                              \

tests/aes.c

@@ -951,7 +951,7 @@ static void doubleBGF128(block_t block)
     {                               /* first: left-shift, then   */
         c |= block[--i] << 1;       /* append the previous MSBit */
         block[i] = (uint8_t) c;
-    }                        /* if first MSBit is carried */
+    } /* if first MSBit is carried */
     block[LAST] ^= c * 0x87; /* .. B ^= 10000111b (B.E.)  */
 }
 #endif
@@ -1132,7 +1132,7 @@ static char padBlock(const uint8_t len, block_t block)
     memset(p, n * (AES_PADDING != 2), n);
     *p ^= '\x80' * (AES_PADDING == 2); /* either PKCS#7 / IEC7816-4 */
 #else
-    if (len)                                /* default (zero) padding    */
+    if (len) /* default (zero) padding    */
     {
         memset(block + len, 0, BLOCKSIZE - len);
     }
@@ -1294,7 +1294,7 @@ char AES_CBC_decrypt(const uint8_t *key,
         xorBlock(iv, y);       /*  IV_next = C              */
         iv = x;
         x += BLOCKSIZE;
-    }        /*  r = 0 unless CTS enabled */
+    } /*  r = 0 unless CTS enabled */
     if (r) { /*  P2 =  Dec(C1) ^ C2       */
         mixThenXor(&rijndaelDecrypt, x, y, x + BLOCKSIZE, r, y + BLOCKSIZE);
         memcpy(y, x + BLOCKSIZE, r);
@@ -1544,7 +1544,7 @@ static void XEX_Cipher(fmix_t cipher,
 
     if (sectid == ~(size_t) 0) {     /* the `i` block is either   */
         memcpy(T, tweak, BLOCKSIZE); /* ..a little-endian number  */
-    }                                /* ..or a byte array.        */
+    } /* ..or a byte array.        */
     else {
         memset(T, 0, BLOCKSIZE);
         copyLVal(T, sectid, 0);
@@ -2537,7 +2537,7 @@ static void modP1305(uint8_t *block, const int ovrfl)
     {
         t += block[i];            /* to get mod, first derive  */
         block[i++] = (uint8_t) t; /* .. B + (5 * q) and then   */
-    }                             /* .. subtract q * (2^130)   */
+    } /* .. subtract q * (2^130)   */
     block[SP - 1] -= 4 * (uint8_t) q;
 }
 

tests/line.c

@@ -77,7 +77,7 @@ void svpng(FILE *fp, unsigned w, unsigned h, const uint8_t *img, bool alpha)
         SVPNG_PUT((u) >> 24);         \
         SVPNG_PUT(((u) >> 16) & 255); \
         SVPNG_PUT(((u) >> 8) & 255);  \
-        SVPNG_PUT((u) &255);          \
+        SVPNG_PUT((u) & 255);         \
     } while (0)
 
 #define SVPNG_U8C(u)              \
@@ -94,7 +94,7 @@ void svpng(FILE *fp, unsigned w, unsigned h, const uint8_t *img, bool alpha)
 
 #define SVPNG_U16LC(u)               \
     do {                             \
-        SVPNG_U8C((u) &255);         \
+        SVPNG_U8C((u) & 255);        \
         SVPNG_U8C(((u) >> 8) & 255); \
     } while (0)
 
@@ -103,7 +103,7 @@ void svpng(FILE *fp, unsigned w, unsigned h, const uint8_t *img, bool alpha)
         SVPNG_U8C((u) >> 24);         \
         SVPNG_U8C(((u) >> 16) & 255); \
         SVPNG_U8C(((u) >> 8) & 255);  \
-        SVPNG_U8C((u) &255);          \
+        SVPNG_U8C((u) & 255);         \
     } while (0)
 
 #define SVPNG_U8ADLER(u)       \