emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extern variable declaration in a .c file is heresy - fixing it

Browse Source
This commit is contained in:
Denis Vlasenko 2007-01-03 01:57:25 +00:00
parent 75fa4eb155
commit bb3d0fab3b
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archival/libunarchive/decompress_unzip.c
View File

@ -45,8 +45,11 @@ typedef struct huft_s {
} v; } v;
} huft_t; } huft_t;
/* Globally-visible data */
off_t gunzip_bytes_out; /* number of output bytes */
uint32_t gunzip_crc;
static int gunzip_src_fd; static int gunzip_src_fd;
unsigned int gunzip_bytes_out; /* number of output bytes */
static unsigned int gunzip_outbuf_count; /* bytes in output buffer */ static unsigned int gunzip_outbuf_count; /* bytes in output buffer */
/* gunzip_window size--must be a power of two, and /* gunzip_window size--must be a power of two, and
@ -55,7 +58,6 @@ enum { gunzip_wsize = 0x8000 };
static unsigned char *gunzip_window; static unsigned char *gunzip_window;
static uint32_t *gunzip_crc_table; 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. */ /* 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) */ #define BMAX 16 /* maximum bit length of any code (16 for explode) */

3
archival/unzip.c
View File

@ -32,9 +32,6 @@
#define ZIP_CDS_END_MAGIC SWAP_LE32(0x06054b50) #define ZIP_CDS_END_MAGIC SWAP_LE32(0x06054b50)
#define ZIP_DD_MAGIC SWAP_LE32(0x08074b50) #define ZIP_DD_MAGIC SWAP_LE32(0x08074b50)
extern unsigned int gunzip_crc;
extern unsigned int gunzip_bytes_out;
typedef union { typedef union {
unsigned char raw[26]; unsigned char raw[26];
struct { struct {

5
include/unarchive.h
View File

@ -64,6 +64,11 @@ typedef struct archive_handle_s {
} archive_handle_t; } archive_handle_t;
extern uint32_t gunzip_crc;
extern off_t gunzip_bytes_out;
extern archive_handle_t *init_handle(void); extern archive_handle_t *init_handle(void);
extern char filter_accept_all(archive_handle_t *archive_handle); extern char filter_accept_all(archive_handle_t *archive_handle);