Fix formatting issues detected by checkstyle

Author: dcommander

jchuff.c

@@ -493,7 +493,7 @@ flush_bits(working_state *state)
   int localbuf = 0;
 
   if (state->simd) {
-#if defined __arm__ || defined __aarch64__
+#if defined(__arm__) || defined(__aarch64__)
     put_bits = state->cur.free_bits;
 #else
     put_bits = SIMD_BIT_BUF_SIZE - state->cur.free_bits;
@@ -519,7 +519,7 @@ flush_bits(working_state *state)
 
   if (state->simd) {                    /* and reset bit buffer to empty */
     state->cur.put_buffer.simd = 0;
-#if defined __arm__ || defined __aarch64__
+#if defined(__arm__) || defined(__aarch64__)
     state->cur.free_bits = 0;
 #else
     state->cur.free_bits = SIMD_BIT_BUF_SIZE;

simd/i386/jchuff-sse2.asm

@@ -646,7 +646,7 @@ EXTN(jsimd_huff_encode_one_block_sse2):
     por         mm_put_buffer, mm_code                    ;     put_buffer |= code;
     cmp         size, 16                                  ;     if (size <= 16)
     jle        .ERLOOP2                                   ;       goto .ERLOOP2;
-    jmp        .BRLOOP2                                   ; } while(1);
+    jmp        .BRLOOP2                                   ; } while (1);
 
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -728,32 +728,32 @@ EXTN(jsimd_huff_encode_one_block_sse2):
     align       16
 .EMIT_ERLOOP1:
     EMIT_QWORD  size, sizeb, sizeh, \
-      {xor      size, size}, \
-      {tzcnt    size, index}, \
-      {inc      size}, \
-      {test     index, index}, \
-      {jnz      .BLOOP1}, \
+      { xor     size, size }, \
+      { tzcnt   size, index }, \
+      { inc     size }, \
+      { test    index, index }, \
+      { jnz     .BLOOP1 }, \
       .ELOOP1
 
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     align       16
 .EMIT_BRLOOP2:
     EMIT_QWORD  emit_temp, emit_tempb, emit_temph, , , , \
-      {cmp      size, 16}, \
-      {jle      .ERLOOP2}, \
+      { cmp     size, 16 }, \
+      { jle     .ERLOOP2 }, \
       .BRLOOP2
 
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     align       16
 .EMIT_ERLOOP2:
     EMIT_QWORD  size, sizeb, sizeh, \
-      {xor      size, size}, \
-      {tzcnt    size, index}, \
-      {inc      size}, \
-      {test     index, index}, \
-      {jnz      .BLOOP2}, \
+      { xor     size, size }, \
+      { tzcnt   size, index }, \
+      { inc     size }, \
+      { test    index, index }, \
+      { jnz     .BLOOP2 }, \
       .ELOOP2
 
 ; For some reason, the OS X linker does not honor the request to align the

simd/x86_64/jchuff-sse2.asm

@@ -493,7 +493,7 @@ EXTN(jsimd_huff_encode_one_block_sse2):
     or          put_buffer, codeq                         ;   put_buffer |= code;
     cmp         nbits, 16                                 ;   if (nbits <= 16)
     jle         .ERLOOP                                   ;     break;
-    jmp         .BRLOOP                                   ; } while(1);
+    jmp         .BRLOOP                                   ; } while (1);
 
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -573,8 +573,9 @@ EXTN(jsimd_huff_encode_one_block_sse2):
 
     align       16
 .EMIT_BRLOOP_CODE:
-    EMIT_QWORD  .EMIT_BRLOOP_CODE_END, {mov nbits, code_temp}  ; insert code, flush buffer,
-                                                               ; nbits = code_temp, goto .EMIT_BRLOOP_CODE_END
+    EMIT_QWORD  .EMIT_BRLOOP_CODE_END, { mov nbits, code_temp }
+                                                          ; insert code, flush buffer,
+                                                          ; nbits = code_temp, goto .EMIT_BRLOOP_CODE_END
 
 ; For some reason, the OS X linker does not honor the request to align the
 ; segment unless we do this.