]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
fix minor compilation condition
authorYann Collet <cyan@fb.com>
Fri, 6 Sep 2019 23:51:16 +0000 (16:51 -0700)
committerYann Collet <cyan@fb.com>
Fri, 6 Sep 2019 23:51:16 +0000 (16:51 -0700)
harness.c is not designed to pass  -Wdeclaration-after-statement

doc/educational_decoder/Makefile
doc/educational_decoder/harness.c
doc/educational_decoder/zstd_decompress.c

index ed3f3fef76dc82db9b9646ec4a61b78a43526064..fc08037558fab6688b5b04da23f331a2e3ab804e 100644 (file)
@@ -6,10 +6,10 @@ CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \
             -I$(ZSTDDIR)/dictBuilder -I$(ZSTDDIR)/deprecated -I$(PRGDIR)
 CFLAGS   ?= -O3
 CFLAGS   += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow                 \
-            -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-            -Wstrict-prototypes -Wundef                                     \
+            -Wstrict-aliasing=1 -Wswitch-enum                               \
+            -Wredundant-decls -Wstrict-prototypes -Wundef                   \
             -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings      \
-            -Wredundant-decls
+            -std=c99
 CFLAGS   += $(DEBUGFLAGS)
 CFLAGS   += $(MOREFLAGS)
 FLAGS     = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MULTITHREAD_LDFLAGS)
index 47882b1689537253cf685deb91a8ffd795ccf916..36f3967a985effc9d21d30566d0e7a72a5bf0695 100644 (file)
@@ -33,7 +33,7 @@ size_t read_file(const char *path, u8 **ptr) {
     }
 
     fseek(f, 0L, SEEK_END);
-    size_t size = ftell(f);
+    size_t size = (size_t)ftell(f);
     rewind(f);
 
     *ptr = malloc(size);
index 26143cd1a33de94110998f6874984285fe25f572..f3e1b848f49d233766c14c6417ba833935f6abe2 100644 (file)
@@ -833,6 +833,7 @@ static size_t decode_literals_compressed(frame_context_t *const ctx,
         // bits (0-1023)."
         num_streams = 1;
     // Fall through as it has the same size format
+        /* fallthrough */
     case 1:
         // "4 streams. Both Compressed_Size and Regenerated_Size use 10 bits
         // (0-1023)."