From 9f153f610fe82528bcd0f976fd9ce2122c516b2d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 08:32:26 +0000 Subject: fsck_minix: getopt32-ification; code shrink; reduce stack usage; fix bug in map_block2: s/(blknr >= 256 * 256)/(blknr < 256 * 256)/ function old new delta get_inode_common - 291 +291 add_zone_common - 205 +205 ask 229 215 -14 write_super_block 109 90 -19 write_block 653 629 -24 bad_zone 95 64 -31 read_block 241 198 -43 fsck_minix_main 3285 3195 -90 add_zone2 217 34 -183 add_zone 216 33 -183 recursive_check 1097 866 -231 recursive_check2 1340 956 -384 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 0/10 up/down: 496/-1202) Total: -706 bytes text data bss dec hex filename 799349 661 7428 807438 c520e busybox_old 798437 661 7428 806526 c4e7e busybox_unstripped --- archival/libunarchive/filter_accept_reject_list.c | 7 +++++-- archival/libunarchive/find_list_entry.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'archival/libunarchive') diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c index bf983b5e8..439ba20ca 100644 --- a/archival/libunarchive/filter_accept_reject_list.c +++ b/archival/libunarchive/filter_accept_reject_list.c @@ -13,11 +13,14 @@ */ char filter_accept_reject_list(archive_handle_t *archive_handle) { - const char *key = archive_handle->file_header->name; - const llist_t *reject_entry = find_list_entry2(archive_handle->reject, key); + const char *key; + const llist_t *reject_entry; const llist_t *accept_entry; + key = archive_handle->file_header->name; + /* If the key is in a reject list fail */ + reject_entry = find_list_entry2(archive_handle->reject, key); if (reject_entry) { return EXIT_FAILURE; } diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c index f2741039d..754058953 100644 --- a/archival/libunarchive/find_list_entry.c +++ b/archival/libunarchive/find_list_entry.c @@ -38,7 +38,7 @@ const llist_t *find_list_entry2(const llist_t *list, const char *filename) if (*c++ == '/') pattern_slash_cnt++; c = filename; d = buf; - /* paranoia is better that buffer overflows */ + /* paranoia is better than buffer overflows */ while (*c && d != buf + sizeof(buf)-1) { if (*c == '/' && --pattern_slash_cnt < 0) break; -- cgit v1.2.3-55-g6feb