Woops, my gunzip fix broke unzip, these cant be static

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 8da9b5cb990a3fd02879a1b14f58213bb211582f..3a7334ce9e10760bfd26a1609680a312f40785cc 100644 (file)
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -83,7 +83,7 @@ typedef struct huft_s {
 } huft_t;
 
 static int gunzip_src_fd;
-static unsigned int gunzip_bytes_out;  /* number of output bytes */
+unsigned int gunzip_bytes_out; /* number of output bytes */
 static unsigned int gunzip_outbuf_count;       /* bytes in output buffer */
 
 /* gunzip_window size--must be a power of two, and
@@ -92,7 +92,7 @@ static const int gunzip_wsize = 0x8000;
 static unsigned char *gunzip_window;
 
 static unsigned int *gunzip_crc_table;
-static unsigned int gunzip_crc;
+unsigned int gunzip_crc;
 
 /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
 #define BMAX 16        /* maximum bit length of any code (16 for explode) */

diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index 8da9b5cb990a3fd02879a1b14f58213bb211582f..3a7334ce9e10760bfd26a1609680a312f40785cc 100644 (file)
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -83,7 +83,7 @@ typedef struct huft_s {
 } huft_t;
 
 static int gunzip_src_fd;
-static unsigned int gunzip_bytes_out;  /* number of output bytes */
+unsigned int gunzip_bytes_out; /* number of output bytes */
 static unsigned int gunzip_outbuf_count;       /* bytes in output buffer */
 
 /* gunzip_window size--must be a power of two, and
@@ -92,7 +92,7 @@ static const int gunzip_wsize = 0x8000;
 static unsigned char *gunzip_window;
 
 static unsigned int *gunzip_crc_table;
-static unsigned int gunzip_crc;
+unsigned int gunzip_crc;
 
 /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */
 #define BMAX 16        /* maximum bit length of any code (16 for explode) */