From 39a04f71ca8ccf81de2cdbd538df519cf34ef2e6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko <vda.linux@googlemail.com> Date: Mon, 31 May 2010 14:18:57 +0200 Subject: archival/*: shrink by reusing sufficiently similar functions function old new delta append_ext - 16 +16 unxz_main 77 83 +6 unlzma_main 77 83 +6 uncompress_main 42 48 +6 gzip_main 184 190 +6 bzip2_main 114 120 +6 bunzip2_main 61 67 +6 bbunpack 469 475 +6 send_tree 355 360 +5 lzop_main 89 92 +3 gunzip_main 61 64 +3 make_new_name_lzop 84 82 -2 make_new_name_gunzip 114 112 -2 make_new_name_unxz 14 - -14 make_new_name_unlzma 14 - -14 make_new_name_uncompress 14 - -14 make_new_name_bunzip2 14 - -14 make_new_name_gzip 17 - -17 make_new_name_bzip2 17 - -17 ------------------------------------------------------------------------------ (add/remove: 1/6 grow/shrink: 10/2 up/down: 69/-94) Total: -25 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> --- include/unarchive.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unarchive.h b/include/unarchive.h index 783a943b6..aa7ecec55 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -155,9 +155,12 @@ IF_DESKTOP(long long) int unpack_Z_stream(int src_fd, int dst_fd) FAST_FUNC; /* wrapper which checks first two bytes to be "BZ" */ IF_DESKTOP(long long) int unpack_bz2_stream_prime(int src_fd, int dst_fd) FAST_FUNC; +char* append_ext(char *filename, const char *expected_ext) FAST_FUNC; int bbunpack(char **argv, - char* (*make_new_name)(char *filename), - IF_DESKTOP(long long) int (*unpacker)(unpack_info_t *info)) FAST_FUNC; + IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(unpack_info_t *info), + char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext), + const char *expected_ext +) FAST_FUNC; #if BB_MMU void open_transformer(int fd, -- cgit v1.2.3-55-g6feb