From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Thu, 17 Aug 2017 09:24:46 +0000 (+0200)
Subject: Make sure we don't export internal functions
X-Git-Tag: 1.9.9-b1~660^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb7fd8a1b0e6228c3d2822df201835b9ca34390a;p=thirdparty%2Fzlib-ng.git

Make sure we don't export internal functions
---

diff --git a/arch/x86/insert_string_sse.c b/arch/x86/insert_string_sse.c
index a927dc0cb..4e303feff 100644
--- a/arch/x86/insert_string_sse.c
+++ b/arch/x86/insert_string_sse.c
@@ -16,7 +16,7 @@
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
 #ifdef X86_SSE4_2_CRC_HASH
-Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count) {
+ZLIB_INTERNAL Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count) {
     Pos ret = 0;
     unsigned int idx;
     unsigned *ip, val, h;
diff --git a/deflate.c b/deflate.c
index ab5b69714..071ce6794 100644
--- a/deflate.c
+++ b/deflate.c
@@ -72,12 +72,12 @@ typedef block_state (*compress_func) (deflate_state *s, int flush);
 static int deflateStateCheck      (z_stream *strm);
 static void slide_hash            (deflate_state *s);
 static block_state deflate_stored (deflate_state *s, int flush);
-block_state deflate_fast         (deflate_state *s, int flush);
-block_state deflate_quick        (deflate_state *s, int flush);
+ZLIB_INTERNAL block_state deflate_fast         (deflate_state *s, int flush);
+ZLIB_INTERNAL block_state deflate_quick        (deflate_state *s, int flush);
 #ifdef MEDIUM_STRATEGY
-block_state deflate_medium       (deflate_state *s, int flush);
+ZLIB_INTERNAL block_state deflate_medium       (deflate_state *s, int flush);
 #endif
-block_state deflate_slow         (deflate_state *s, int flush);
+ZLIB_INTERNAL block_state deflate_slow         (deflate_state *s, int flush);
 static block_state deflate_rle   (deflate_state *s, int flush);
 static block_state deflate_huff  (deflate_state *s, int flush);
 static void lm_init              (deflate_state *s);
@@ -1188,7 +1188,7 @@ void check_match(deflate_state *s, IPos start, IPos match, int length) {
  *    option -- not supported here).
  */
 
-void fill_window_c(deflate_state *s) {
+void ZLIB_INTERNAL fill_window_c(deflate_state *s) {
     unsigned n;
     unsigned more;    /* Amount of free space at the end of the window. */
     unsigned int wsize = s->w_size;
diff --git a/deflate.h b/deflate.h
index 17f95c2aa..3d707eede 100644
--- a/deflate.h
+++ b/deflate.h
@@ -343,7 +343,7 @@ typedef enum {
    memory checker errors from longest match routines */
 
 
-void fill_window_c(deflate_state *s);
+void ZLIB_INTERNAL fill_window_c(deflate_state *s);
 
         /* in trees.c */
 void ZLIB_INTERNAL _tr_init(deflate_state *s);
diff --git a/deflate_fast.c b/deflate_fast.c
index 5b86e2799..e36bd7906 100644
--- a/deflate_fast.c
+++ b/deflate_fast.c
@@ -16,7 +16,7 @@
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
-block_state deflate_fast(deflate_state *s, int flush) {
+ZLIB_INTERNAL block_state deflate_fast(deflate_state *s, int flush) {
     IPos hash_head;       /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
 
diff --git a/deflate_medium.c b/deflate_medium.c
index fd79866c7..cfff29463 100644
--- a/deflate_medium.c
+++ b/deflate_medium.c
@@ -195,7 +195,7 @@ static void fizzle_matches(deflate_state *s, struct match *current, struct match
     }
 }
 
-block_state deflate_medium(deflate_state *s, int flush) {
+ZLIB_INTERNAL block_state deflate_medium(deflate_state *s, int flush) {
     struct match current_match, next_match;
 
     memset(&current_match, 0, sizeof(struct match));
diff --git a/deflate_slow.c b/deflate_slow.c
index 61c1888cd..2cbb1e0b1 100644
--- a/deflate_slow.c
+++ b/deflate_slow.c
@@ -23,7 +23,7 @@
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
-block_state deflate_slow(deflate_state *s, int flush) {
+ZLIB_INTERNAL block_state deflate_slow(deflate_state *s, int flush) {
     IPos hash_head;          /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
 
diff --git a/functable.c b/functable.c
index 5ebd3559d..659e3fbd0 100644
--- a/functable.c
+++ b/functable.c
@@ -13,7 +13,6 @@
 
 
 /* insert_string */
-ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsigned int count);
 #ifdef X86_SSE4_2_CRC_HASH
 extern Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count);
 #elif defined(ARM_ACLE_CRC_HASH)
@@ -21,7 +20,6 @@ extern Pos insert_string_acle(deflate_state *const s, const Pos str, unsigned in
 #endif
 
 /* fill_window */
-ZLIB_INTERNAL void fill_window_stub(deflate_state *s);
 #ifdef X86_SSE2_FILL_WINDOW
 extern void fill_window_sse(deflate_state *s);
 #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM)
@@ -29,13 +27,19 @@ extern void fill_window_arm(deflate_state *s);
 #endif
 
 /* adler32 */
-ZLIB_INTERNAL uint32_t adler32_stub(uint32_t adler, const unsigned char *buf, size_t len);
+extern uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len);
 #if (defined(__ARM_NEON__) || defined(__ARM_NEON))
 extern uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len);
 #endif
 
+/* stub definitions */
+ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsigned int count);
+ZLIB_INTERNAL void fill_window_stub(deflate_state *s);
+ZLIB_INTERNAL uint32_t adler32_stub(uint32_t adler, const unsigned char *buf, size_t len);
+
+/* functable init */
+ZLIB_INTERNAL struct functable_s functable = {fill_window_stub,insert_string_stub,adler32_stub};
 
-struct functable_s functable = {fill_window_stub,insert_string_stub,adler32_stub};
 
 /* stub functions */
 ZLIB_INTERNAL Pos insert_string_stub(deflate_state *const s, const Pos str, unsigned int count) {
diff --git a/functable.h b/functable.h
index 3b01f7cb6..4e6f53ee8 100644
--- a/functable.h
+++ b/functable.h
@@ -8,15 +8,13 @@
 
 #include "deflate.h"
 
-uint32_t adler32_c(uint32_t adler, const unsigned char *buf, size_t len);
-
 struct functable_s {
     void     (* fill_window)    (deflate_state *s);
     Pos      (* insert_string)  (deflate_state *const s, const Pos str, unsigned int count);
     uint32_t (* adler32)        (uint32_t adler, const unsigned char *buf, size_t len);
 };
 
-extern struct functable_s functable;
+ZLIB_INTERNAL extern struct functable_s functable;
 
 
 #endif