diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/libunarchive/decompress_unzip.c | 6 | ||||
-rw-r--r-- | archival/unzip.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 09f89e25c..83261de6d 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c | |||
@@ -45,8 +45,11 @@ typedef struct huft_s { | |||
45 | } v; | 45 | } v; |
46 | } huft_t; | 46 | } huft_t; |
47 | 47 | ||
48 | /* Globally-visible data */ | ||
49 | off_t gunzip_bytes_out; /* number of output bytes */ | ||
50 | uint32_t gunzip_crc; | ||
51 | |||
48 | static int gunzip_src_fd; | 52 | static int gunzip_src_fd; |
49 | unsigned int gunzip_bytes_out; /* number of output bytes */ | ||
50 | static unsigned int gunzip_outbuf_count; /* bytes in output buffer */ | 53 | static unsigned int gunzip_outbuf_count; /* bytes in output buffer */ |
51 | 54 | ||
52 | /* gunzip_window size--must be a power of two, and | 55 | /* gunzip_window size--must be a power of two, and |
@@ -55,7 +58,6 @@ enum { gunzip_wsize = 0x8000 }; | |||
55 | static unsigned char *gunzip_window; | 58 | static unsigned char *gunzip_window; |
56 | 59 | ||
57 | static uint32_t *gunzip_crc_table; | 60 | static uint32_t *gunzip_crc_table; |
58 | uint32_t gunzip_crc; | ||
59 | 61 | ||
60 | /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ | 62 | /* If BMAX needs to be larger than 16, then h and x[] should be ulg. */ |
61 | #define BMAX 16 /* maximum bit length of any code (16 for explode) */ | 63 | #define BMAX 16 /* maximum bit length of any code (16 for explode) */ |
diff --git a/archival/unzip.c b/archival/unzip.c index 570789427..34a3a8519 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -32,9 +32,6 @@ | |||
32 | #define ZIP_CDS_END_MAGIC SWAP_LE32(0x06054b50) | 32 | #define ZIP_CDS_END_MAGIC SWAP_LE32(0x06054b50) |
33 | #define ZIP_DD_MAGIC SWAP_LE32(0x08074b50) | 33 | #define ZIP_DD_MAGIC SWAP_LE32(0x08074b50) |
34 | 34 | ||
35 | extern unsigned int gunzip_crc; | ||
36 | extern unsigned int gunzip_bytes_out; | ||
37 | |||
38 | typedef union { | 35 | typedef union { |
39 | unsigned char raw[26]; | 36 | unsigned char raw[26]; |
40 | struct { | 37 | struct { |