From: Pavel P <pavlov.pavel@gmail.com>
Date: Mon, 6 Feb 2023 15:06:30 +0000 (+0300)
Subject: Correct inflate_fast function signature
X-Git-Tag: 2.1.0-beta1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e75a5c981ae4b9f798cb72ff145f180b13b4b8a;p=thirdparty%2Fzlib-ng.git

Correct inflate_fast function signature
---

diff --git a/cpu_features.h b/cpu_features.h
index 696b15221..f71372dd6 100644
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -94,22 +94,28 @@ extern uint32_t chunksize_power8(void);
 extern uint8_t* chunkmemset_safe_power8(uint8_t *out, unsigned dist, unsigned len, unsigned left);
 #endif
 
+#ifdef ZLIB_COMPAT
+typedef struct z_stream_s z_stream;
+#else
+typedef struct zng_stream_s zng_stream;
+#endif
+
 /* inflate fast loop */
-extern void inflate_fast_c(void *strm, uint32_t start);
+extern void inflate_fast_c(PREFIX3(stream) *strm, uint32_t start);
 #ifdef X86_SSE2_CHUNKSET
-extern void inflate_fast_sse2(void *strm, uint32_t start);
+extern void inflate_fast_sse2(PREFIX3(stream) *strm, uint32_t start);
 #endif
 #ifdef X86_SSE41
-extern void inflate_fast_sse41(void *strm, uint32_t start);
+extern void inflate_fast_sse41(PREFIX3(stream) *strm, uint32_t start);
 #endif
 #ifdef X86_AVX_CHUNKSET
-extern void inflate_fast_avx(void *strm, uint32_t start);
+extern void inflate_fast_avx(PREFIX3(stream) *strm, uint32_t start);
 #endif
 #ifdef ARM_NEON_CHUNKSET
-extern void inflate_fast_neon(void *strm, uint32_t start);
+extern void inflate_fast_neon(PREFIX3(stream) *strm, uint32_t start);
 #endif
 #ifdef POWER8_VSX_CHUNKSET
-extern void inflate_fast_power8(void *strm, uint32_t start);
+extern void inflate_fast_power8(PREFIX3(stream) *strm, uint32_t start);
 #endif
 
 /* CRC32 */
diff --git a/functable.c b/functable.c
index 7f3bc6e03..7ecc43fa3 100644
--- a/functable.c
+++ b/functable.c
@@ -413,7 +413,7 @@ static uint8_t* chunkmemset_safe_stub(uint8_t* out, unsigned dist, unsigned len,
     return functable.chunkmemset_safe(out, dist, len, left);
 }
 
-static void inflate_fast_stub(void *strm, uint32_t start) {
+static void inflate_fast_stub(PREFIX3(stream) *strm, uint32_t start) {
     init_functable();
     functable.inflate_fast(strm, start);
 }
diff --git a/functable.h b/functable.h
index 51acf4578..6c277f50a 100644
--- a/functable.h
+++ b/functable.h
@@ -10,6 +10,12 @@
 #include "crc32_fold.h"
 #include "adler32_fold.h"
 
+#ifdef ZLIB_COMPAT
+typedef struct z_stream_s z_stream;
+#else
+typedef struct zng_stream_s zng_stream;
+#endif
+
 struct functable_s {
     uint32_t (* adler32)            (uint32_t adler, const uint8_t *buf, size_t len);
     uint32_t (* adler32_fold_copy)  (uint32_t adler, uint8_t *dst, const uint8_t *src, size_t len);
@@ -21,7 +27,7 @@ struct functable_s {
     uint32_t (* compare256)         (const uint8_t *src0, const uint8_t *src1);
     uint32_t (* chunksize)          (void);
     uint8_t* (* chunkmemset_safe)   (uint8_t *out, unsigned dist, unsigned len, unsigned left);
-    void     (* inflate_fast)       (void *strm, uint32_t start);
+    void     (* inflate_fast)       (PREFIX3(stream) *strm, uint32_t start);
     void     (* insert_string)      (deflate_state *const s, uint32_t str, uint32_t count);
     uint32_t (* longest_match)      (deflate_state *const s, Pos cur_match);
     uint32_t (* longest_match_slow) (deflate_state *const s, Pos cur_match);