From 68404f13d4bf4826e3609703dad5375763db28ab Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 09:00:54 +0000 Subject: *: add -Wunused-parameter; fix resulting breakage function old new delta procps_scan 1265 1298 +33 aliascmd 278 283 +5 parse_file_cmd 116 120 +4 dname_enc 373 377 +4 setcmd 90 93 +3 execcmd 57 60 +3 count_lines 72 74 +2 process_command_subs 340 339 -1 test_main 409 407 -2 mknod_main 179 177 -2 handle_incoming_and_exit 2653 2651 -2 argstr 1312 1310 -2 shiftcmd 131 128 -3 exitcmd 46 43 -3 dotcmd 297 294 -3 breakcmd 86 83 -3 evalpipe 353 349 -4 evalcommand 1180 1176 -4 evalcmd 109 105 -4 send_tree 374 369 -5 mkfifo_main 82 77 -5 evalsubshell 152 147 -5 typecmd 75 69 -6 letcmd 61 55 -6 add_cmd 1190 1183 -7 main 891 883 -8 ash_main 1415 1407 -8 parse_stream 1377 1367 -10 alloc_procps_scan 55 - -55 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 7/21 up/down: 54/-148) Total: -94 bytes text data bss dec hex filename 797195 658 7428 805281 c49a1 busybox_old 797101 658 7428 805187 c4943 busybox_unstripped --- shell/hush.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'shell/hush.c') diff --git a/shell/hush.c b/shell/hush.c index c61607dd3..2d5697269 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -536,11 +536,13 @@ static int done_pipe(struct p_context *ctx, pipe_style type); static int redirect_dup_num(struct in_str *input); static int redirect_opt_num(o_string *o); #if ENABLE_HUSH_TICK -static int process_command_subs(o_string *dest, struct p_context *ctx, struct in_str *input, const char *subst_end); +static int process_command_subs(o_string *dest, /*struct p_context *ctx,*/ + struct in_str *input, const char *subst_end); #endif static int parse_group(o_string *dest, struct p_context *ctx, struct in_str *input, int ch); static const char *lookup_param(const char *src); -static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input); +static int handle_dollar(o_string *dest, /*struct p_context *ctx,*/ + struct in_str *input); static int parse_stream(o_string *dest, struct p_context *ctx, struct in_str *input0, const char *end_trigger); /* setup: */ static int parse_and_run_stream(struct in_str *inp, int parse_flag); @@ -741,14 +743,14 @@ static void set_every_sighandler(void (*handler)(int)) signal(SIGCHLD, handler); } -static void handler_ctrl_c(int sig) +static void handler_ctrl_c(int sig ATTRIBUTE_UNUSED) { debug_printf_jobs("got sig %d\n", sig); // as usual we can have all kinds of nasty problems with leaked malloc data here siglongjmp(toplevel_jb, 1); } -static void handler_ctrl_z(int sig) +static void handler_ctrl_z(int sig ATTRIBUTE_UNUSED) { pid_t pid; @@ -3257,8 +3259,10 @@ static FILE *generate_stream_from_list(struct pipe *head) } /* Return code is exit status of the process that is run. */ -static int process_command_subs(o_string *dest, struct p_context *ctx, - struct in_str *input, const char *subst_end) +static int process_command_subs(o_string *dest, + /*struct p_context *ctx,*/ + struct in_str *input, + const char *subst_end) { int retcode, ch, eol_cnt; o_string result = NULL_O_STRING; @@ -3351,7 +3355,7 @@ static const char *lookup_param(const char *src) } /* return code: 0 for OK, 1 for syntax error */ -static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *input) +static int handle_dollar(o_string *dest, /*struct p_context *ctx,*/ struct in_str *input) { int ch = b_peek(input); /* first character after the $ */ unsigned char quote_mask = dest->o_quote ? 0x80 : 0; @@ -3409,7 +3413,7 @@ static int handle_dollar(o_string *dest, struct p_context *ctx, struct in_str *i #if ENABLE_HUSH_TICK case '(': b_getch(input); - process_command_subs(dest, ctx, input, ")"); + process_command_subs(dest, /*ctx,*/ input, ")"); break; #endif case '-': @@ -3507,7 +3511,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, b_addqchr(dest, b_getch(input), dest->o_quote); break; case '$': - if (handle_dollar(dest, ctx, input) != 0) { + if (handle_dollar(dest, /*ctx,*/ input) != 0) { debug_printf_parse("parse_stream return 1: handle_dollar returned non-0\n"); return 1; } @@ -3532,7 +3536,7 @@ static int parse_stream(o_string *dest, struct p_context *ctx, break; #if ENABLE_HUSH_TICK case '`': - process_command_subs(dest, ctx, input, "`"); + process_command_subs(dest, /*ctx,*/ input, "`"); break; #endif case '>': -- cgit v1.2.3