diff options
| author | Denis Vlasenko | 2007-01-03 01:57:25 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-01-03 01:57:25 +0000 |
| commit | bb3d0fab3b46d64e93687bc30b405d0878eca296 (patch) | |
| tree | 173e0171c3c09d353febba4938f1c9cdc39c248c | |
| parent | 75fa4eb1551ddc6c4436bb2614f4754ed9942b5f (diff) | |
| download | busybox-bb3d0fab3b46d64e93687bc30b405d0878eca296.zip busybox-bb3d0fab3b46d64e93687bc30b405d0878eca296.tar.gz | |
extern variable declaration in a .c file is heresy - fixing it
| -rw-r--r-- | archival/libunarchive/decompress_unzip.c | 6 | ||||
| -rw-r--r-- | archival/unzip.c | 3 | ||||
| -rw-r--r-- | include/unarchive.h | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c index 09f89e2..83261de 100644 --- a/archival/libunarchive/decompress_unzip.c +++ b/archival/libunarchive/decompress_unzip.c @@ -45,8 +45,11 @@ typedef struct huft_s { } v; } huft_t; +/* Globally-visible data */ +off_t gunzip_bytes_out; /* number of output bytes */ +uint32_t gunzip_crc; + static int gunzip_src_fd; -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 @@ -55,7 +58,6 @@ enum { gunzip_wsize = 0x8000 }; static unsigned char *gunzip_window; static uint32_t *gunzip_crc_table; -uint32_t 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/unzip.c b/archival/unzip.c index 5707894..34a3a85 100644 --- a/archival/unzip.c +++ b/archival/unzip.c @@ -32,9 +32,6 @@ #define ZIP_CDS_END_MAGIC SWAP_LE32(0x06054b50) #define ZIP_DD_MAGIC SWAP_LE32(0x08074b50) -extern unsigned int gunzip_crc; -extern unsigned int gunzip_bytes_out; - typedef union { unsigned char raw[26]; struct { diff --git a/include/unarchive.h b/include/unarchive.h index 88c0088..843f68f 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -64,6 +64,11 @@ typedef struct archive_handle_s { } archive_handle_t; + +extern uint32_t gunzip_crc; +extern off_t gunzip_bytes_out; + + extern archive_handle_t *init_handle(void); extern char filter_accept_all(archive_handle_t *archive_handle); |