aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-10-07 17:11:04 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-10-07 17:11:04 +0200
commit868530ade244bf8162fb6a10816bd815b166d509 (patch)
tree874fa8d8b979ae95ca53badadfa614f0de4ed7ac /arch
parentc3b34d8b39cae35fec8c6fb644d90dc80e574236 (diff)
downloadbusybox-w32-1_25_1.tar.gz
busybox-w32-1_25_1.tar.bz2
busybox-w32-1_25_1.zip
Apply post-1.25.0 patches, bump version to 1.25.11_25_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rw-r--r--archival/gzip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/archival/gzip.c b/archival/gzip.c
index 8f1e4ff29..9e0bee815 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2220,10 +2220,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
2220 opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */ 2220 opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
2221 if (opt == 0) 2221 if (opt == 0)
2222 opt = 1 << 6; /* default: 6 */ 2222 opt = 1 << 6; /* default: 6 */
2223 /* Map 1..3 to 4 */ 2223 opt = ffs(opt >> 4); /* Maps -1..-4 to [0], -5 to [1] ... -9 to [5] */
2224 if (opt & 0x7)
2225 opt |= 1 << 4;
2226 opt = ffs(opt >> 3);
2227 max_chain_length = 1 << gzip_level_config[opt].chain_shift; 2224 max_chain_length = 1 << gzip_level_config[opt].chain_shift;
2228 good_match = gzip_level_config[opt].good; 2225 good_match = gzip_level_config[opt].good;
2229 max_lazy_match = gzip_level_config[opt].lazy2 * 2; 2226 max_lazy_match = gzip_level_config[opt].lazy2 * 2;