svn commit: trunk/busybox: archival archival/libunarchive include

vda at busybox.net vda at busybox.net
Wed Jan 3 01:57:26 UTC 2007


Author: vda
Date: 2007-01-02 17:57:25 -0800 (Tue, 02 Jan 2007)
New Revision: 17139

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


Modified:
   trunk/busybox/archival/libunarchive/decompress_unzip.c
   trunk/busybox/archival/unzip.c
   trunk/busybox/include/unarchive.h


Changeset:
Modified: trunk/busybox/archival/libunarchive/decompress_unzip.c
===================================================================
--- trunk/busybox/archival/libunarchive/decompress_unzip.c	2007-01-03 01:36:42 UTC (rev 17138)
+++ trunk/busybox/archival/libunarchive/decompress_unzip.c	2007-01-03 01:57:25 UTC (rev 17139)
@@ -45,8 +45,11 @@
 	} 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 @@
 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) */

Modified: trunk/busybox/archival/unzip.c
===================================================================
--- trunk/busybox/archival/unzip.c	2007-01-03 01:36:42 UTC (rev 17138)
+++ trunk/busybox/archival/unzip.c	2007-01-03 01:57:25 UTC (rev 17139)
@@ -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 {

Modified: trunk/busybox/include/unarchive.h
===================================================================
--- trunk/busybox/include/unarchive.h	2007-01-03 01:36:42 UTC (rev 17138)
+++ trunk/busybox/include/unarchive.h	2007-01-03 01:57:25 UTC (rev 17139)
@@ -64,6 +64,11 @@
 
 } 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);




More information about the busybox-cvs mailing list