From 7aa63042d04d320b84c207996086bd41b5bc268f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 1 Sep 2010 16:04:24 +0200 Subject: [PATCH] libbb: xfunc_error_retval can be a byte function old new delta xfunc_die 55 60 +5 log_and_exit 43 45 +2 hush_main 961 963 +2 xfunc_error_retval 4 1 -3 tty_main 87 84 -3 sv_main 1183 1180 -3 sort_main 804 801 -3 run_applet_no_and_exit 440 437 -3 puts_maybe_newline 198 195 -3 nohup_main 228 225 -3 httpd_main 753 750 -3 get_header_tar 1496 1493 -3 fsck_minix_main 2972 2969 -3 expr_main 110 107 -3 cmp_main 641 638 -3 chat_main 1359 1356 -3 builtin_exit 48 45 -3 arping_main 1587 1584 -3 BB_EXECVP_or_die 47 44 -3 send_cgi_and_exit 901 895 -6 diff_main 1197 1191 -6 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/18 up/down: 9/-60) Total: -51 bytes Signed-off-by: Denys Vlasenko --- include/libbb.h | 4 ++-- libbb/default_error_retval.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libbb.h b/include/libbb.h index 4b69c855f..d5580b4b0 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -881,9 +881,9 @@ int spawn_and_wait(char **argv) FAST_FUNC; struct nofork_save_area { jmp_buf die_jmp; const char *applet_name; - int xfunc_error_retval; uint32_t option_mask32; int die_sleep; + uint8_t xfunc_error_retval; smallint saved; }; void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; @@ -994,7 +994,7 @@ enum { extern const char *msg_eol; extern smallint logmode; extern int die_sleep; -extern int xfunc_error_retval; +extern uint8_t xfunc_error_retval; extern jmp_buf die_jmp; extern void xfunc_die(void) NORETURN FAST_FUNC; extern void bb_show_usage(void) NORETURN FAST_FUNC; diff --git a/libbb/default_error_retval.c b/libbb/default_error_retval.c index 4da5b3efb..4f6395fa2 100644 --- a/libbb/default_error_retval.c +++ b/libbb/default_error_retval.c @@ -15,4 +15,4 @@ #include "libbb.h" -int xfunc_error_retval = EXIT_FAILURE; +uint8_t xfunc_error_retval = EXIT_FAILURE;