emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lzop: code shrink

Browse Source 
function                                             old     new   delta
lzo_decompress                                       526     524      -2
lzo_compress                                         473     470      -3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-02-01 01:41:31 +01:00
parent 97058d0585
commit 99ac1759dd
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archival/libarchive/lzo1x_d.c
View File

@ -31,8 +31,7 @@
************************************************************************/ ************************************************************************/
/* safe decompression with overrun testing */ /* safe decompression with overrun testing */
int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len, int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len,
uint8_t* out, unsigned* out_len, uint8_t* out, unsigned* out_len /*, void* wrkmem */)
void* wrkmem UNUSED_PARAM)
{ {
register uint8_t* op; register uint8_t* op;
register const uint8_t* ip; register const uint8_t* ip;

9
archival/lzop.c
View File

@ -141,8 +141,7 @@ static void copy3(uint8_t* ip, const uint8_t* m_pos, unsigned off)
#define TEST_OP (op <= op_end) #define TEST_OP (op <= op_end)
static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len, static NOINLINE int lzo1x_optimize(uint8_t *in, unsigned in_len,
uint8_t *out, unsigned *out_len, uint8_t *out, unsigned *out_len /*, void* wrkmem */)
void* wrkmem UNUSED_PARAM)
{ {
uint8_t* op; uint8_t* op;
uint8_t* ip; uint8_t* ip;
@ -724,7 +723,7 @@ static NOINLINE int lzo_compress(const header_t *h)
/* optimize */ /* optimize */
if (h->method == M_LZO1X_999) { if (h->method == M_LZO1X_999) {
unsigned new_len = src_len; unsigned new_len = src_len;
r = lzo1x_optimize(b2, dst_len, b1, &new_len, NULL); r = lzo1x_optimize(b2, dst_len, b1, &new_len /*, NULL*/);
if (r != 0 /*LZO_E_OK*/ || new_len != src_len) if (r != 0 /*LZO_E_OK*/ || new_len != src_len)
bb_error_msg_and_die("internal error - optimization failed"); bb_error_msg_and_die("internal error - optimization failed");
} }
@ -859,9 +858,9 @@ static NOINLINE int lzo_decompress(const header_t *h)
/* decompress */ /* decompress */
// if (option_mask32 & OPT_F) // if (option_mask32 & OPT_F)
// r = lzo1x_decompress(b1, src_len, b2, &d, NULL); // r = lzo1x_decompress(b1, src_len, b2, &d /*, NULL*/);
// else // else
r = lzo1x_decompress_safe(b1, src_len, b2, &d, NULL); r = lzo1x_decompress_safe(b1, src_len, b2, &d /*, NULL*/);
if (r != 0 /*LZO_E_OK*/ || dst_len != d) { if (r != 0 /*LZO_E_OK*/ || dst_len != d) {
bb_error_msg_and_die("corrupted data"); bb_error_msg_and_die("corrupted data");

6
include/liblzo_interface.h
View File

@ -49,12 +49,10 @@ int lzo1x_999_compress_level(const uint8_t* in, unsigned in_len,
/* decompression */ /* decompression */
//int lzo1x_decompress(const uint8_t* src, unsigned src_len, //int lzo1x_decompress(const uint8_t* src, unsigned src_len,
// uint8_t* dst, unsigned* dst_len, // uint8_t* dst, unsigned* dst_len /*, void* wrkmem */);
// void* wrkmem /* NOT USED */);
/* safe decompression with overrun testing */ /* safe decompression with overrun testing */
int lzo1x_decompress_safe(const uint8_t* src, unsigned src_len, int lzo1x_decompress_safe(const uint8_t* src, unsigned src_len,
uint8_t* dst, unsigned* dst_len, uint8_t* dst, unsigned* dst_len /*, void* wrkmem */);
void* wrkmem /* NOT USED */);
#define LZO_E_OK 0 #define LZO_E_OK 0
#define LZO_E_ERROR (-1) #define LZO_E_ERROR (-1)