From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 20 Sep 2019 01:21:46 +0000 (-0700)
Subject: Fixed warnings in checksum fuzzer and example. #418
X-Git-Tag: 1.9.9-b1~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=145bd4ca8f1a8207c4da7edba57bb197c940627e;p=thirdparty%2Fzlib-ng.git

Fixed warnings in checksum fuzzer and example. #418
---

diff --git a/test/example.c b/test/example.c
index 7c179649..e69aaafd 100644
--- a/test/example.c
+++ b/test/example.c
@@ -114,7 +114,7 @@ void test_gzio(const char *fname, unsigned char *uncompr, z_size_t uncomprLen)
     }
     strcpy((char*)uncompr, "garbage");
 
-    if (PREFIX(gzread)(file, uncompr, (unsigned)uncomprLen) != len) {
+    if (PREFIX(gzread)(file, uncompr, (unsigned)uncomprLen) != (int)len) {
         fprintf(stderr, "gzread err: %s\n", PREFIX(gzerror)(file, &err));
         exit(1);
     }
@@ -549,7 +549,7 @@ void test_dict_inflate(unsigned char *compr, size_t comprLen, unsigned char *unc
 /* ===========================================================================
  * Test deflateBound() with small buffers
  */
-void test_deflate_bound(unsigned char *compr, size_t comprLen)
+void test_deflate_bound(void)
 {
     PREFIX3(stream) c_stream; /* compression stream */
     int err;
@@ -713,10 +713,10 @@ void test_deflate_pending(unsigned char *compr, size_t comprLen)
         CHECK_ERR(err, "deflate");
     }
 
-    err = PREFIX(deflatePending)(&c_stream,ped,bits);
+    err = PREFIX(deflatePending)(&c_stream, ped, bits);
     CHECK_ERR(err, "deflatePending");
 
-    if (*bits >= 0 && *bits <=7 && *ped >= 0) {
+    if (*bits >= 0 && *bits <= 7) {
         printf("deflatePending(): OK\n");
     } else {
         printf("deflatePending(): error\n");
@@ -740,7 +740,7 @@ void test_deflate_pending(unsigned char *compr, size_t comprLen)
 /* ===========================================================================
  * Test deflatePrime() with small buffers
  */
- void test_deflate_prime(unsigned char *compr, size_t comprLen)
+void test_deflate_prime(unsigned char *compr, size_t comprLen)
 {
     PREFIX3(stream) c_stream; /* compression stream */
     int err;
@@ -936,7 +936,7 @@ int main(int argc, char *argv[])
     test_dict_deflate(compr, comprLen);
     test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
 
-    test_deflate_bound(compr, comprLen);
+    test_deflate_bound();
     test_deflate_copy(compr, comprLen);
     test_deflate_get_dict(compr, comprLen);
     test_deflate_set_header(compr, comprLen);
diff --git a/test/fuzz/checksum_fuzzer.c b/test/fuzz/checksum_fuzzer.c
index a50a9a68..058fa7ff 100644
--- a/test/fuzz/checksum_fuzzer.c
+++ b/test/fuzz/checksum_fuzzer.c
@@ -41,6 +41,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataLen) {
     uint32_t crc4 = PREFIX(crc32_combine_op)(crc1, crc3, op);
     crc1 = PREFIX(crc32_z)(crc1, data + offset, buffSize);
     assert(crc1 == crc4);
+    (void)crc1;
     (void)crc4;
   }
   crc1 = PREFIX(crc32_z)(crc1, data + offset, dataLen % buffSize);
@@ -48,6 +49,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataLen) {
   crc2 = PREFIX(crc32_z)(crc2, data, dataLen);
 
   assert(crc1 == crc2);
+  (void)crc2;
   assert(PREFIX(crc32_combine)(crc1, crc2, dataLen) ==
          PREFIX(crc32_combine)(crc1, crc1, dataLen));
 
@@ -66,6 +68,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t dataLen) {
   adler2 = PREFIX(adler32_z)(adler2, data, dataLen);
 
   assert(adler1 == adler2);
+  (void)adler1;
+  (void)adler2;
   assert(PREFIX(adler32_combine)(adler1, adler2, dataLen) ==
          PREFIX(adler32_combine)(adler1, adler1, dataLen));