Fixed GCC 6 -Wmisleading-indentation warnings. Resolves richgel999#51

gpakosz · Jan 3, 2017 · bcba636 · bcba636
1 parent 9d505a8
commit bcba636
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/miniz.c b/miniz.c
@@ -1594,7 +1594,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
       {
         mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i;
         r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
-        for ( i = 0; i <= 143; ++i) *p++ = 8; for ( ; i <= 255; ++i) *p++ = 9; for ( ; i <= 279; ++i) *p++ = 7; for ( ; i <= 287; ++i) *p++ = 8;
+        for ( i = 0; i <= 143; ++i) { *p++ = 8; } for ( ; i <= 255; ++i) { *p++ = 9; } for ( ; i <= 279; ++i) { *p++ = 7; } for ( ; i <= 287; ++i) { *p++ = 8; }
       }
       else
       {
@@ -2381,7 +2381,7 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
         if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) break;
       TDEFL_PROBE; TDEFL_PROBE; TDEFL_PROBE;
     }
-    if (!dist) break; q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) continue; p = s; probe_len = 32;
+    if (!dist) { break; } q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) { continue; } p = s; probe_len = 32;
     do { } while ( (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) &&
                    (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (--probe_len > 0) );
     if (!probe_len)

diff --git a/tinfl.c b/tinfl.c
@@ -50,7 +50,7 @@ enum
 };
 
 #ifndef TINFL_FUNCSPEC
-#define TINFL_FUNCSPEC MZ_FUNCSPEC
+#define TINFL_FUNCSPEC
 #endif
 
 // High level decompression functions:
@@ -307,7 +307,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
       {
         mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i;
         r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
-        for ( i = 0; i <= 143; ++i) *p++ = 8; for ( ; i <= 255; ++i) *p++ = 9; for ( ; i <= 279; ++i) *p++ = 7; for ( ; i <= 287; ++i) *p++ = 8;
+        for ( i = 0; i <= 143; ++i) { *p++ = 8; }  for ( ; i <= 255; ++i) { *p++ = 9; } for ( ; i <= 279; ++i) { *p++ = 7; } for ( ; i <= 287; ++i) { *p++ = 8; }
       }
       else
       {