From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 10 Jul 2020 20:59:25 +0000 (-0700)
Subject: Removed legacy typedef caddr_t from gz_compress_mmap.
X-Git-Tag: 1.9.9-b1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac87a0762efb6d4c01c17a11701e4a8125541cc;p=thirdparty%2Fzlib-ng.git

Removed legacy typedef caddr_t from gz_compress_mmap.
---

diff --git a/test/fuzz/minigzip_fuzzer.c b/test/fuzz/minigzip_fuzzer.c
index e2ac6f7b..a4bd112d 100644
--- a/test/fuzz/minigzip_fuzzer.c
+++ b/test/fuzz/minigzip_fuzzer.c
@@ -121,7 +121,7 @@ int gz_compress_mmap(FILE *in, gzFile out) {
     int len;
     int err;
     int ifd = fileno(in);
-    caddr_t buf;    /* mmap'ed buffer for the entire input file */
+    char *buf;      /* mmap'ed buffer for the entire input file */
     off_t buf_len;  /* length of the input file */
     struct stat sb;
 
@@ -131,8 +131,8 @@ int gz_compress_mmap(FILE *in, gzFile out) {
     if (buf_len <= 0) return Z_ERRNO;
 
     /* Now do the actual mmap: */
-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
-    if (buf == (caddr_t)(-1)) return Z_ERRNO;
+    buf = mmap((void *)0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    if (buf == (char *)(-1)) return Z_ERRNO;
 
     /* Compress the whole file at once: */
     len = PREFIX(gzwrite)(out, (char *)buf, (unsigned)buf_len);
diff --git a/test/minigzip.c b/test/minigzip.c
index a09fcdcc..da45d48c 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -134,7 +134,7 @@ int gz_compress_mmap(FILE *in, gzFile out) {
     if (buf_len <= 0) return Z_ERRNO;
 
     /* Now do the actual mmap: */
-    buf = mmap((char *) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+    buf = mmap((void *)0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
     if (buf == (char *)(-1)) return Z_ERRNO;
 
     /* Compress the whole file at once: */