aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-03-10 19:22:06 +0000
committerGravatar Rob Landley <rob@landley.net>2006-03-10 19:22:06 +0000
commitbc68cd14ccaebc17e7e03a08e51fddfb91007624 (patch)
treebeb32cedafc6232bf8a49fe90f0769d471ea6791 /archival
parentdae6aa28598cb2353291f18ca52e768c3259165a (diff)
downloadbusybox-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.gz
busybox-bc68cd14ccaebc17e7e03a08e51fddfb91007624.tar.bz2
Patch from Denis Vlasenko turning static const int (which gets emitted into
the busybox binary) into enums (which don't).
Diffstat (limited to 'archival')
-rw-r--r--archival/gzip.c12
-rw-r--r--archival/libunarchive/decompress_unzip.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/archival/gzip.c b/archival/gzip.c
index 783a453a7..fa6e85b66 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -732,25 +732,26 @@ static unsigned match_start; /* start of matching string */
static int eofile; /* flag set at end of input file */
static unsigned lookahead; /* number of valid bytes ahead in window */
-static const unsigned max_chain_length = 4096;
+enum {
+ max_chain_length = 4096,
/* To speed up deflation, hash chains are never searched beyond this length.
* A higher limit improves compression ratio but degrades the speed.
*/
-static const unsigned int max_lazy_match = 258;
+ max_lazy_match = 258,
/* Attempt to find a better match only when the current match is strictly
* smaller than this value. This mechanism is used only for compression
* levels >= 4.
*/
-#define max_insert_length max_lazy_match
+ max_insert_length = max_lazy_match,
/* Insert new strings in the hash table only if the match length
* is not greater than this length. This saves time but degrades compression.
* max_insert_length is used only for compression levels <= 3.
*/
-static const unsigned good_match = 32;
+ good_match = 32,
/* Use a faster search when the previous match is longer than this */
@@ -761,12 +762,13 @@ static const unsigned good_match = 32;
* found for specific files.
*/
-static const int nice_match = 258; /* Stop searching when current match exceeds this */
+ nice_match = 258 /* Stop searching when current match exceeds this */
/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
* For deflate_fast() (levels <= 3) good is ignored and lazy has a different
* meaning.
*/
+};
#define EQUAL 0
/* result of memcmp for equal strings */
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 7776dee69..7c43bed12 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -92,7 +92,7 @@ static unsigned int gunzip_outbuf_count; /* bytes in output buffer */
/* gunzip_window size--must be a power of two, and
* at least 32K for zip's deflate method */
-static const unsigned int gunzip_wsize = 0x8000;
+enum { gunzip_wsize = 0x8000 };
static unsigned char *gunzip_window;
static unsigned int *gunzip_crc_table;