aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-06-15 17:11:59 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-06-15 17:11:59 +0200
commit5d72ae53c972bd55864f47523e3923b1c683c185 (patch)
tree12b160529f19972fca76bde047fac8a86fff2c3f
parent45100b8d07aa69945194610a30cb427901128312 (diff)
downloadbusybox-w32-5d72ae53c972bd55864f47523e3923b1c683c185.tar.gz
busybox-w32-5d72ae53c972bd55864f47523e3923b1c683c185.tar.bz2
busybox-w32-5d72ae53c972bd55864f47523e3923b1c683c185.zip
fix "ifdef ENABLE_foo": should always be "#if ENABLE_foo"
function old new delta pack_gzip 1729 1789 +60 fill_window 220 216 -4 static.gzip_level_config 24 - -24 gzip_main 275 192 -83 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 1/2 up/down: 60/-111) Total: -51 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/gzip.c8
-rw-r--r--procps/pstree.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/archival/gzip.c b/archival/gzip.c
index e698c26cd..7c6dee1d7 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -275,7 +275,7 @@ enum {
275 * input file length plus MIN_LOOKAHEAD. 275 * input file length plus MIN_LOOKAHEAD.
276 */ 276 */
277 277
278#ifndef ENABLE_FEATURE_GZIP_LEVELS 278#if !ENABLE_FEATURE_GZIP_LEVELS
279 279
280 max_chain_length = 4096, 280 max_chain_length = 4096,
281/* To speed up deflation, hash chains are never searched beyond this length. 281/* To speed up deflation, hash chains are never searched beyond this length.
@@ -314,7 +314,7 @@ enum {
314 314
315struct globals { 315struct globals {
316 316
317#ifdef ENABLE_FEATURE_GZIP_LEVELS 317#if ENABLE_FEATURE_GZIP_LEVELS
318 unsigned max_chain_length; 318 unsigned max_chain_length;
319 unsigned max_lazy_match; 319 unsigned max_lazy_match;
320 unsigned good_match; 320 unsigned good_match;
@@ -2196,7 +2196,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
2196#endif 2196#endif
2197{ 2197{
2198 unsigned opt; 2198 unsigned opt;
2199#ifdef ENABLE_FEATURE_GZIP_LEVELS 2199#if ENABLE_FEATURE_GZIP_LEVELS
2200 static const struct { 2200 static const struct {
2201 uint8_t good; 2201 uint8_t good;
2202 uint8_t chain_shift; 2202 uint8_t chain_shift;
@@ -2224,7 +2224,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
2224 if (opt & 0x18) // -d and/or -t 2224 if (opt & 0x18) // -d and/or -t
2225 return gunzip_main(argc, argv); 2225 return gunzip_main(argc, argv);
2226#endif 2226#endif
2227#ifdef ENABLE_FEATURE_GZIP_LEVELS 2227#if ENABLE_FEATURE_GZIP_LEVELS
2228 opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 7 : 5; /* drop cfv[dt]qn bits */ 2228 opt >>= ENABLE_FEATURE_GZIP_DECOMPRESS ? 7 : 5; /* drop cfv[dt]qn bits */
2229 if (opt == 0) 2229 if (opt == 0)
2230 opt = 1 << 6; /* default: 6 */ 2230 opt = 1 << 6; /* default: 6 */
diff --git a/procps/pstree.c b/procps/pstree.c
index f97e99639..bc9f0c927 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -34,7 +34,7 @@
34 34
35struct child; 35struct child;
36 36
37#ifdef ENABLE_FEATURE_SHOW_THREADS 37#if ENABLE_FEATURE_SHOW_THREADS
38/* For threads, we add {...} around the comm, so we need two extra bytes */ 38/* For threads, we add {...} around the comm, so we need two extra bytes */
39# define COMM_DISP_LEN (COMM_LEN + 2) 39# define COMM_DISP_LEN (COMM_LEN + 2)
40#else 40#else