diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-01 10:56:19 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-01 10:56:19 +0100 |
commit | ddacb03e875dd4c1a79421d030da9cdc4f081e6e (patch) | |
tree | 5fef3dda6eb881153d8acef87a297fc75223398e /archival | |
parent | 06076494da41755893a6e072bbd9889581a9e9d1 (diff) | |
download | busybox-w32-ddacb03e875dd4c1a79421d030da9cdc4f081e6e.tar.gz busybox-w32-ddacb03e875dd4c1a79421d030da9cdc4f081e6e.tar.bz2 busybox-w32-ddacb03e875dd4c1a79421d030da9cdc4f081e6e.zip |
libbb: commonalize a bit of little-endian CRC32 table generation code
function old new delta
global_crc32_new_table_le - 11 +11
crc32_new_table_le - 9 +9
inflate_unzip_internal 560 556 -4
flash_eraseall_main 823 819 -4
unpack_xz_stream 2403 2394 -9
lzop_main 121 112 -9
gzip_main 187 178 -9
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/5 up/down: 20/-35) Total: -15 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r-- | archival/gzip.c | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_gunzip.c | 2 | ||||
-rw-r--r-- | archival/libarchive/decompress_unxz.c | 2 | ||||
-rw-r--r-- | archival/lzop.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/archival/gzip.c b/archival/gzip.c index e3dd79291..c5a1fe9b4 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -2239,7 +2239,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv) | |||
2239 | ALLOC(ush, G1.prev, 1L << BITS); | 2239 | ALLOC(ush, G1.prev, 1L << BITS); |
2240 | 2240 | ||
2241 | /* Initialize the CRC32 table */ | 2241 | /* Initialize the CRC32 table */ |
2242 | global_crc32_table = crc32_filltable(NULL, 0); | 2242 | global_crc32_new_table_le(); |
2243 | 2243 | ||
2244 | argv += optind; | 2244 | argv += optind; |
2245 | return bbunpack(argv, pack_gzip, append_ext, "gz"); | 2245 | return bbunpack(argv, pack_gzip, append_ext, "gz"); |
diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c index c8245d736..edff7e0e5 100644 --- a/archival/libarchive/decompress_gunzip.c +++ b/archival/libarchive/decompress_gunzip.c | |||
@@ -1000,7 +1000,7 @@ inflate_unzip_internal(STATE_PARAM transformer_state_t *xstate) | |||
1000 | gunzip_bb = 0; | 1000 | gunzip_bb = 0; |
1001 | 1001 | ||
1002 | /* Create the crc table */ | 1002 | /* Create the crc table */ |
1003 | gunzip_crc_table = crc32_filltable(NULL, 0); | 1003 | gunzip_crc_table = crc32_new_table_le(); |
1004 | gunzip_crc = ~0; | 1004 | gunzip_crc = ~0; |
1005 | 1005 | ||
1006 | error_msg = "corrupted data"; | 1006 | error_msg = "corrupted data"; |
diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c index 0be85500c..8ae7a275b 100644 --- a/archival/libarchive/decompress_unxz.c +++ b/archival/libarchive/decompress_unxz.c | |||
@@ -52,7 +52,7 @@ unpack_xz_stream(transformer_state_t *xstate) | |||
52 | IF_DESKTOP(long long) int total = 0; | 52 | IF_DESKTOP(long long) int total = 0; |
53 | 53 | ||
54 | if (!global_crc32_table) | 54 | if (!global_crc32_table) |
55 | global_crc32_table = crc32_filltable(NULL, /*endian:*/ 0); | 55 | global_crc32_new_table_le(); |
56 | 56 | ||
57 | memset(&iobuf, 0, sizeof(iobuf)); | 57 | memset(&iobuf, 0, sizeof(iobuf)); |
58 | membuf = xmalloc(2 * BUFSIZ); | 58 | membuf = xmalloc(2 * BUFSIZ); |
diff --git a/archival/lzop.c b/archival/lzop.c index ba27aeff0..fef8cdba3 100644 --- a/archival/lzop.c +++ b/archival/lzop.c | |||
@@ -1148,6 +1148,6 @@ int lzop_main(int argc UNUSED_PARAM, char **argv) | |||
1148 | if (ENABLE_UNLZOP && applet_name[4] == 'o') | 1148 | if (ENABLE_UNLZOP && applet_name[4] == 'o') |
1149 | option_mask32 |= OPT_DECOMPRESS; | 1149 | option_mask32 |= OPT_DECOMPRESS; |
1150 | 1150 | ||
1151 | global_crc32_table = crc32_filltable(NULL, 0); | 1151 | global_crc32_new_table_le(); |
1152 | return bbunpack(argv, pack_lzop, make_new_name_lzop, /*unused:*/ NULL); | 1152 | return bbunpack(argv, pack_lzop, make_new_name_lzop, /*unused:*/ NULL); |
1153 | } | 1153 | } |