Patch from Bernhard Fischer to make a bunch of symbols static

which were otherwise cluttering the global namespace.

2 files changed, 8 insertions, 7 deletions

diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c
index 13832c240..9e065c4fd 100644
--- a/archival/libunarchive/check_header_gzip.c
+++ b/archival/libunarchive/check_header_gzip.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "libbb.h"
+#include "unarchive.h" /* for external decl of check_header_gzip */
 
 extern void check_header_gzip(int src_fd)
 {
diff --git a/archival/libunarchive/decompress_uncompress.c b/archival/libunarchive/decompress_uncompress.c
index e39872cbe..a3fcf64e2 100644
--- a/archival/libunarchive/decompress_uncompress.c
+++ b/archival/libunarchive/decompress_uncompress.c
@@ -65,23 +65,23 @@
 #define MAXCODE(n)      (1L << (n))
 
 /* Block compress mode -C compatible with 2.0 */
-int block_mode = BLOCK_MODE;
+static int block_mode = BLOCK_MODE;
 
 /* user settable max # bits/code */
-int maxbits = BITS;
+static int maxbits = BITS;
 
 /* Exitcode of compress (-1 no file compressed) */
-int exit_code = -1;
+static int exit_code = -1;
 
 /* Input buffer */
-unsigned char inbuf[IBUFSIZ + 64];
+static unsigned char inbuf[IBUFSIZ + 64];
 
 /* Output buffer */
-unsigned char outbuf[OBUFSIZ + 2048];
+static unsigned char outbuf[OBUFSIZ + 2048];
 
 
-long int htab[HSIZE];
-unsigned short codetab[HSIZE];
+static long int htab[HSIZE];
+static unsigned short codetab[HSIZE];
 
 #define htabof(i)                               htab[i]
 #define codetabof(i)                    codetab[i]