aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
commita60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
treef59bc665cfe3d2d32622450d80523e3c1265e501 /shell
parentf6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
downloadbusybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c86
-rw-r--r--shell/cttyhack.c2
-rw-r--r--shell/hush.c20
-rw-r--r--shell/lash_unused.c8
-rw-r--r--shell/msh.c48
5 files changed, 82 insertions, 82 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 58bfc5278..77fe91a24 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -261,7 +261,7 @@ extern struct globals_misc *const ash_ptr_to_globals_misc;
261 * just do a longjmp to the exception handler. The type of exception is 261 * just do a longjmp to the exception handler. The type of exception is
262 * stored in the global variable "exception". 262 * stored in the global variable "exception".
263 */ 263 */
264static void raise_exception(int) ATTRIBUTE_NORETURN; 264static void raise_exception(int) NORETURN;
265static void 265static void
266raise_exception(int e) 266raise_exception(int e)
267{ 267{
@@ -281,7 +281,7 @@ raise_exception(int e)
281 * are held using the INT_OFF macro. (The test for iflag is just 281 * are held using the INT_OFF macro. (The test for iflag is just
282 * defensive programming.) 282 * defensive programming.)
283 */ 283 */
284static void raise_interrupt(void) ATTRIBUTE_NORETURN; 284static void raise_interrupt(void) NORETURN;
285static void 285static void
286raise_interrupt(void) 286raise_interrupt(void)
287{ 287{
@@ -1048,7 +1048,7 @@ ash_vmsg(const char *msg, va_list ap)
1048 * is not NULL then error prints an error message using printf style 1048 * is not NULL then error prints an error message using printf style
1049 * formatting. It then raises the error exception. 1049 * formatting. It then raises the error exception.
1050 */ 1050 */
1051static void ash_vmsg_and_raise(int, const char *, va_list) ATTRIBUTE_NORETURN; 1051static void ash_vmsg_and_raise(int, const char *, va_list) NORETURN;
1052static void 1052static void
1053ash_vmsg_and_raise(int cond, const char *msg, va_list ap) 1053ash_vmsg_and_raise(int cond, const char *msg, va_list ap)
1054{ 1054{
@@ -1068,7 +1068,7 @@ ash_vmsg_and_raise(int cond, const char *msg, va_list ap)
1068 /* NOTREACHED */ 1068 /* NOTREACHED */
1069} 1069}
1070 1070
1071static void ash_msg_and_raise_error(const char *, ...) ATTRIBUTE_NORETURN; 1071static void ash_msg_and_raise_error(const char *, ...) NORETURN;
1072static void 1072static void
1073ash_msg_and_raise_error(const char *msg, ...) 1073ash_msg_and_raise_error(const char *msg, ...)
1074{ 1074{
@@ -1080,7 +1080,7 @@ ash_msg_and_raise_error(const char *msg, ...)
1080 va_end(ap); 1080 va_end(ap);
1081} 1081}
1082 1082
1083static void ash_msg_and_raise(int, const char *, ...) ATTRIBUTE_NORETURN; 1083static void ash_msg_and_raise(int, const char *, ...) NORETURN;
1084static void 1084static void
1085ash_msg_and_raise(int cond, const char *msg, ...) 1085ash_msg_and_raise(int cond, const char *msg, ...)
1086{ 1086{
@@ -2462,7 +2462,7 @@ docd(const char *dest, int flags)
2462} 2462}
2463 2463
2464static int 2464static int
2465cdcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 2465cdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
2466{ 2466{
2467 const char *dest; 2467 const char *dest;
2468 const char *path; 2468 const char *path;
@@ -2526,7 +2526,7 @@ cdcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
2526} 2526}
2527 2527
2528static int 2528static int
2529pwdcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 2529pwdcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
2530{ 2530{
2531 int flags; 2531 int flags;
2532 const char *dir = curdir; 2532 const char *dir = curdir;
@@ -3128,7 +3128,7 @@ printalias(const struct alias *ap)
3128 * TODO - sort output 3128 * TODO - sort output
3129 */ 3129 */
3130static int 3130static int
3131aliascmd(int argc ATTRIBUTE_UNUSED, char **argv) 3131aliascmd(int argc UNUSED_PARAM, char **argv)
3132{ 3132{
3133 char *n, *v; 3133 char *n, *v;
3134 int ret = 0; 3134 int ret = 0;
@@ -3163,7 +3163,7 @@ aliascmd(int argc ATTRIBUTE_UNUSED, char **argv)
3163} 3163}
3164 3164
3165static int 3165static int
3166unaliascmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 3166unaliascmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
3167{ 3167{
3168 int i; 3168 int i;
3169 3169
@@ -3670,7 +3670,7 @@ restartjob(struct job *jp, int mode)
3670} 3670}
3671 3671
3672static int 3672static int
3673fg_bgcmd(int argc ATTRIBUTE_UNUSED, char **argv) 3673fg_bgcmd(int argc UNUSED_PARAM, char **argv)
3674{ 3674{
3675 struct job *jp; 3675 struct job *jp;
3676 FILE *out; 3676 FILE *out;
@@ -3957,7 +3957,7 @@ showjobs(FILE *out, int mode)
3957} 3957}
3958 3958
3959static int 3959static int
3960jobscmd(int argc ATTRIBUTE_UNUSED, char **argv) 3960jobscmd(int argc UNUSED_PARAM, char **argv)
3961{ 3961{
3962 int mode, m; 3962 int mode, m;
3963 3963
@@ -4010,7 +4010,7 @@ getstatus(struct job *job)
4010} 4010}
4011 4011
4012static int 4012static int
4013waitcmd(int argc ATTRIBUTE_UNUSED, char **argv) 4013waitcmd(int argc UNUSED_PARAM, char **argv)
4014{ 4014{
4015 struct job *job; 4015 struct job *job;
4016 int retval; 4016 int retval;
@@ -5681,7 +5681,7 @@ argstr(char *p, int flag, struct strlist *var_str_list)
5681} 5681}
5682 5682
5683static char * 5683static char *
5684scanleft(char *startp, char *rmesc, char *rmescend ATTRIBUTE_UNUSED, char *str, int quotes, 5684scanleft(char *startp, char *rmesc, char *rmescend UNUSED_PARAM, char *str, int quotes,
5685 int zero) 5685 int zero)
5686{ 5686{
5687// This commented out code was added by James Simmons <jsimmons@infradead.org> 5687// This commented out code was added by James Simmons <jsimmons@infradead.org>
@@ -5785,7 +5785,7 @@ scanright(char *startp, char *rmesc, char *rmescend, char *str, int quotes,
5785 return 0; 5785 return 0;
5786} 5786}
5787 5787
5788static void varunset(const char *, const char *, const char *, int) ATTRIBUTE_NORETURN; 5788static void varunset(const char *, const char *, const char *, int) NORETURN;
5789static void 5789static void
5790varunset(const char *end, const char *var, const char *umsg, int varflags) 5790varunset(const char *end, const char *var, const char *umsg, int varflags)
5791{ 5791{
@@ -6906,7 +6906,7 @@ tryexec(USE_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char *
6906 * Exec a program. Never returns. If you change this routine, you may 6906 * Exec a program. Never returns. If you change this routine, you may
6907 * have to change the find_command routine as well. 6907 * have to change the find_command routine as well.
6908 */ 6908 */
6909static void shellexec(char **, const char *, int) ATTRIBUTE_NORETURN; 6909static void shellexec(char **, const char *, int) NORETURN;
6910static void 6910static void
6911shellexec(char **argv, const char *path, int idx) 6911shellexec(char **argv, const char *path, int idx)
6912{ 6912{
@@ -7083,7 +7083,7 @@ addcmdentry(char *name, struct cmdentry *entry)
7083} 7083}
7084 7084
7085static int 7085static int
7086hashcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 7086hashcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
7087{ 7087{
7088 struct tblentry **pp; 7088 struct tblentry **pp;
7089 struct tblentry *cmdp; 7089 struct tblentry *cmdp;
@@ -7385,7 +7385,7 @@ describe_command(char *command, int describe_command_verbose)
7385} 7385}
7386 7386
7387static int 7387static int
7388typecmd(int argc ATTRIBUTE_UNUSED, char **argv) 7388typecmd(int argc UNUSED_PARAM, char **argv)
7389{ 7389{
7390 int i = 1; 7390 int i = 1;
7391 int err = 0; 7391 int err = 0;
@@ -7404,7 +7404,7 @@ typecmd(int argc ATTRIBUTE_UNUSED, char **argv)
7404 7404
7405#if ENABLE_ASH_CMDCMD 7405#if ENABLE_ASH_CMDCMD
7406static int 7406static int
7407commandcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 7407commandcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
7408{ 7408{
7409 int c; 7409 int c;
7410 enum { 7410 enum {
@@ -8341,7 +8341,7 @@ mklocal(char *name)
8341 * The "local" command. 8341 * The "local" command.
8342 */ 8342 */
8343static int 8343static int
8344localcmd(int argc ATTRIBUTE_UNUSED, char **argv) 8344localcmd(int argc UNUSED_PARAM, char **argv)
8345{ 8345{
8346 char *name; 8346 char *name;
8347 8347
@@ -8353,19 +8353,19 @@ localcmd(int argc ATTRIBUTE_UNUSED, char **argv)
8353} 8353}
8354 8354
8355static int 8355static int
8356falsecmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 8356falsecmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
8357{ 8357{
8358 return 1; 8358 return 1;
8359} 8359}
8360 8360
8361static int 8361static int
8362truecmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 8362truecmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
8363{ 8363{
8364 return 0; 8364 return 0;
8365} 8365}
8366 8366
8367static int 8367static int
8368execcmd(int argc ATTRIBUTE_UNUSED, char **argv) 8368execcmd(int argc UNUSED_PARAM, char **argv)
8369{ 8369{
8370 if (argv[1]) { 8370 if (argv[1]) {
8371 iflag = 0; /* exit on error */ 8371 iflag = 0; /* exit on error */
@@ -8380,7 +8380,7 @@ execcmd(int argc ATTRIBUTE_UNUSED, char **argv)
8380 * The return command. 8380 * The return command.
8381 */ 8381 */
8382static int 8382static int
8383returncmd(int argc ATTRIBUTE_UNUSED, char **argv) 8383returncmd(int argc UNUSED_PARAM, char **argv)
8384{ 8384{
8385 /* 8385 /*
8386 * If called outside a function, do what ksh does; 8386 * If called outside a function, do what ksh does;
@@ -8561,7 +8561,7 @@ isassignment(const char *p)
8561 return *q == '='; 8561 return *q == '=';
8562} 8562}
8563static int 8563static int
8564bltincmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 8564bltincmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
8565{ 8565{
8566 /* Preserve exitstatus of a previous possible redirection 8566 /* Preserve exitstatus of a previous possible redirection
8567 * as POSIX mandates */ 8567 * as POSIX mandates */
@@ -8874,7 +8874,7 @@ prehash(union node *n)
8874 * in the standard shell so we don't make it one here. 8874 * in the standard shell so we don't make it one here.
8875 */ 8875 */
8876static int 8876static int
8877breakcmd(int argc ATTRIBUTE_UNUSED, char **argv) 8877breakcmd(int argc UNUSED_PARAM, char **argv)
8878{ 8878{
8879 int n = argv[1] ? number(argv[1]) : 1; 8879 int n = argv[1] ? number(argv[1]) : 1;
8880 8880
@@ -9377,7 +9377,7 @@ chkmail(void)
9377} 9377}
9378 9378
9379static void 9379static void
9380changemail(const char *val ATTRIBUTE_UNUSED) 9380changemail(const char *val UNUSED_PARAM)
9381{ 9381{
9382 mail_var_path_changed = 1; 9382 mail_var_path_changed = 1;
9383} 9383}
@@ -9533,7 +9533,7 @@ options(int cmdline)
9533 * The shift builtin command. 9533 * The shift builtin command.
9534 */ 9534 */
9535static int 9535static int
9536shiftcmd(int argc ATTRIBUTE_UNUSED, char **argv) 9536shiftcmd(int argc UNUSED_PARAM, char **argv)
9537{ 9537{
9538 int n; 9538 int n;
9539 char **ap1, **ap2; 9539 char **ap1, **ap2;
@@ -9595,7 +9595,7 @@ showvars(const char *sep_prefix, int on, int off)
9595 * The set command builtin. 9595 * The set command builtin.
9596 */ 9596 */
9597static int 9597static int
9598setcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 9598setcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
9599{ 9599{
9600 int retval; 9600 int retval;
9601 9601
@@ -9797,7 +9797,7 @@ static struct heredoc *heredoc;
9797 */ 9797 */
9798#define NEOF ((union node *)&tokpushback) 9798#define NEOF ((union node *)&tokpushback)
9799 9799
9800static void raise_error_syntax(const char *) ATTRIBUTE_NORETURN; 9800static void raise_error_syntax(const char *) NORETURN;
9801static void 9801static void
9802raise_error_syntax(const char *msg) 9802raise_error_syntax(const char *msg)
9803{ 9803{
@@ -9810,7 +9810,7 @@ raise_error_syntax(const char *msg)
9810 * is the token that is expected, or -1 if more than one type of token can 9810 * is the token that is expected, or -1 if more than one type of token can
9811 * occur at this point. 9811 * occur at this point.
9812 */ 9812 */
9813static void raise_error_unexpected_syntax(int) ATTRIBUTE_NORETURN; 9813static void raise_error_unexpected_syntax(int) NORETURN;
9814static void 9814static void
9815raise_error_unexpected_syntax(int token) 9815raise_error_unexpected_syntax(int token)
9816{ 9816{
@@ -11414,7 +11414,7 @@ evalstring(char *s, int mask)
11414 * The eval command. 11414 * The eval command.
11415 */ 11415 */
11416static int 11416static int
11417evalcmd(int argc ATTRIBUTE_UNUSED, char **argv) 11417evalcmd(int argc UNUSED_PARAM, char **argv)
11418{ 11418{
11419 char *p; 11419 char *p;
11420 char *concat; 11420 char *concat;
@@ -11563,7 +11563,7 @@ dotcmd(int argc, char **argv)
11563} 11563}
11564 11564
11565static int 11565static int
11566exitcmd(int argc ATTRIBUTE_UNUSED, char **argv) 11566exitcmd(int argc UNUSED_PARAM, char **argv)
11567{ 11567{
11568 if (stoppedjobs()) 11568 if (stoppedjobs())
11569 return 0; 11569 return 0;
@@ -11787,7 +11787,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
11787 * The trap builtin. 11787 * The trap builtin.
11788 */ 11788 */
11789static int 11789static int
11790trapcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 11790trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
11791{ 11791{
11792 char *action; 11792 char *action;
11793 char **ap; 11793 char **ap;
@@ -11840,7 +11840,7 @@ trapcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
11840 * Lists available builtins 11840 * Lists available builtins
11841 */ 11841 */
11842static int 11842static int
11843helpcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 11843helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
11844{ 11844{
11845 unsigned col; 11845 unsigned col;
11846 unsigned i; 11846 unsigned i;
@@ -11876,7 +11876,7 @@ helpcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
11876 * The export and readonly commands. 11876 * The export and readonly commands.
11877 */ 11877 */
11878static int 11878static int
11879exportcmd(int argc ATTRIBUTE_UNUSED, char **argv) 11879exportcmd(int argc UNUSED_PARAM, char **argv)
11880{ 11880{
11881 struct var *vp; 11881 struct var *vp;
11882 char *name; 11882 char *name;
@@ -11927,7 +11927,7 @@ unsetfunc(const char *name)
11927 * with the same name. 11927 * with the same name.
11928 */ 11928 */
11929static int 11929static int
11930unsetcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 11930unsetcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
11931{ 11931{
11932 char **ap; 11932 char **ap;
11933 int i; 11933 int i;
@@ -11965,7 +11965,7 @@ static const unsigned char timescmd_str[] ALIGN1 = {
11965}; 11965};
11966 11966
11967static int 11967static int
11968timescmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 11968timescmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
11969{ 11969{
11970 long clk_tck, s, t; 11970 long clk_tck, s, t;
11971 const unsigned char *p; 11971 const unsigned char *p;
@@ -12017,7 +12017,7 @@ dash_arith(const char *s)
12017 * Copyright (C) 2003 Vladimir Oleynik <dzo@simtreas.ru> 12017 * Copyright (C) 2003 Vladimir Oleynik <dzo@simtreas.ru>
12018 */ 12018 */
12019static int 12019static int
12020letcmd(int argc ATTRIBUTE_UNUSED, char **argv) 12020letcmd(int argc UNUSED_PARAM, char **argv)
12021{ 12021{
12022 arith_t i; 12022 arith_t i;
12023 12023
@@ -12059,7 +12059,7 @@ typedef enum __rlimit_resource rlim_t;
12059 * -e Use line editing (tty only) 12059 * -e Use line editing (tty only)
12060 */ 12060 */
12061static int 12061static int
12062readcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 12062readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
12063{ 12063{
12064 static const char *const arg_REPLY[] = { "REPLY", NULL }; 12064 static const char *const arg_REPLY[] = { "REPLY", NULL };
12065 12065
@@ -12256,7 +12256,7 @@ readcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
12256} 12256}
12257 12257
12258static int 12258static int
12259umaskcmd(int argc ATTRIBUTE_UNUSED, char **argv) 12259umaskcmd(int argc UNUSED_PARAM, char **argv)
12260{ 12260{
12261 static const char permuser[3] ALIGN1 = "ugo"; 12261 static const char permuser[3] ALIGN1 = "ugo";
12262 static const char permmode[3] ALIGN1 = "rwx"; 12262 static const char permmode[3] ALIGN1 = "rwx";
@@ -12431,7 +12431,7 @@ printlim(enum limtype how, const struct rlimit *limit,
12431} 12431}
12432 12432
12433static int 12433static int
12434ulimitcmd(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) 12434ulimitcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
12435{ 12435{
12436 int c; 12436 int c;
12437 rlim_t val = 0; 12437 rlim_t val = 0;
@@ -13194,7 +13194,7 @@ arith(const char *expr, int *perrcode)
13194/* 13194/*
13195 * Called to exit the shell. 13195 * Called to exit the shell.
13196 */ 13196 */
13197static void exitshell(void) ATTRIBUTE_NORETURN; 13197static void exitshell(void) NORETURN;
13198static void 13198static void
13199exitshell(void) 13199exitshell(void)
13200{ 13200{
@@ -13373,7 +13373,7 @@ extern int etext();
13373 * is used to figure out how far we had gotten. 13373 * is used to figure out how far we had gotten.
13374 */ 13374 */
13375int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 13375int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
13376int ash_main(int argc ATTRIBUTE_UNUSED, char **argv) 13376int ash_main(int argc UNUSED_PARAM, char **argv)
13377{ 13377{
13378 char *shinit; 13378 char *shinit;
13379 volatile int state; 13379 volatile int state;
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index bbe514933..0aa4b8a2c 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -38,7 +38,7 @@ struct serial_struct {
38}; 38};
39 39
40int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 40int cttyhack_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
41int cttyhack_main(int argc ATTRIBUTE_UNUSED, char **argv) 41int cttyhack_main(int argc UNUSED_PARAM, char **argv)
42{ 42{
43 int fd; 43 int fd;
44 char console[sizeof(int)*3 + 16]; 44 char console[sizeof(int)*3 + 16];
diff --git a/shell/hush.c b/shell/hush.c
index 72186f970..5b5a54241 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -538,8 +538,8 @@ static int run_list(struct pipe *pi);
538#define pseudo_exec_argv(ptrs2free, argv) pseudo_exec_argv(argv) 538#define pseudo_exec_argv(ptrs2free, argv) pseudo_exec_argv(argv)
539#define pseudo_exec(ptrs2free, child) pseudo_exec(child) 539#define pseudo_exec(ptrs2free, child) pseudo_exec(child)
540#endif 540#endif
541static void pseudo_exec_argv(char **ptrs2free, char **argv) ATTRIBUTE_NORETURN; 541static void pseudo_exec_argv(char **ptrs2free, char **argv) NORETURN;
542static void pseudo_exec(char **ptrs2free, struct child_prog *child) ATTRIBUTE_NORETURN; 542static void pseudo_exec(char **ptrs2free, struct child_prog *child) NORETURN;
543static int run_pipe(struct pipe *pi); 543static int run_pipe(struct pipe *pi);
544/* data structure manipulation: */ 544/* data structure manipulation: */
545static int setup_redirect(struct p_context *ctx, int fd, redir_type style, struct in_str *input); 545static int setup_redirect(struct p_context *ctx, int fd, redir_type style, struct in_str *input);
@@ -805,14 +805,14 @@ static void set_every_sighandler(void (*handler)(int))
805 signal(SIGCHLD, handler); 805 signal(SIGCHLD, handler);
806} 806}
807 807
808static void handler_ctrl_c(int sig ATTRIBUTE_UNUSED) 808static void handler_ctrl_c(int sig UNUSED_PARAM)
809{ 809{
810 debug_printf_jobs("got sig %d\n", sig); 810 debug_printf_jobs("got sig %d\n", sig);
811// as usual we can have all kinds of nasty problems with leaked malloc data here 811// as usual we can have all kinds of nasty problems with leaked malloc data here
812 siglongjmp(toplevel_jb, 1); 812 siglongjmp(toplevel_jb, 1);
813} 813}
814 814
815static void handler_ctrl_z(int sig ATTRIBUTE_UNUSED) 815static void handler_ctrl_z(int sig UNUSED_PARAM)
816{ 816{
817 pid_t pid; 817 pid_t pid;
818 818
@@ -849,7 +849,7 @@ static void handler_ctrl_z(int sig ATTRIBUTE_UNUSED)
849 * (will faithfully resend signal to itself, producing correct exit state) 849 * (will faithfully resend signal to itself, producing correct exit state)
850 * or called directly with -EXITCODE. 850 * or called directly with -EXITCODE.
851 * We also call it if xfunc is exiting. */ 851 * We also call it if xfunc is exiting. */
852static void sigexit(int sig) ATTRIBUTE_NORETURN; 852static void sigexit(int sig) NORETURN;
853static void sigexit(int sig) 853static void sigexit(int sig)
854{ 854{
855 /* Disable all signals: job control, SIGPIPE, etc. */ 855 /* Disable all signals: job control, SIGPIPE, etc. */
@@ -866,7 +866,7 @@ static void sigexit(int sig)
866} 866}
867 867
868/* Restores tty foreground process group, and exits. */ 868/* Restores tty foreground process group, and exits. */
869static void hush_exit(int exitcode) ATTRIBUTE_NORETURN; 869static void hush_exit(int exitcode) NORETURN;
870static void hush_exit(int exitcode) 870static void hush_exit(int exitcode)
871{ 871{
872 fflush(NULL); /* flush all streams */ 872 fflush(NULL); /* flush all streams */
@@ -4004,7 +4004,7 @@ int lash_main(int argc, char **argv)
4004/* 4004/*
4005 * Built-ins 4005 * Built-ins
4006 */ 4006 */
4007static int builtin_true(char **argv ATTRIBUTE_UNUSED) 4007static int builtin_true(char **argv UNUSED_PARAM)
4008{ 4008{
4009 return 0; 4009 return 0;
4010} 4010}
@@ -4188,7 +4188,7 @@ static int builtin_fg_bg(char **argv)
4188#endif 4188#endif
4189 4189
4190#if ENABLE_HUSH_HELP 4190#if ENABLE_HUSH_HELP
4191static int builtin_help(char **argv ATTRIBUTE_UNUSED) 4191static int builtin_help(char **argv UNUSED_PARAM)
4192{ 4192{
4193 const struct built_in_command *x; 4193 const struct built_in_command *x;
4194 4194
@@ -4203,7 +4203,7 @@ static int builtin_help(char **argv ATTRIBUTE_UNUSED)
4203#endif 4203#endif
4204 4204
4205#if ENABLE_HUSH_JOB 4205#if ENABLE_HUSH_JOB
4206static int builtin_jobs(char **argv ATTRIBUTE_UNUSED) 4206static int builtin_jobs(char **argv UNUSED_PARAM)
4207{ 4207{
4208 struct pipe *job; 4208 struct pipe *job;
4209 const char *status_string; 4209 const char *status_string;
@@ -4220,7 +4220,7 @@ static int builtin_jobs(char **argv ATTRIBUTE_UNUSED)
4220} 4220}
4221#endif 4221#endif
4222 4222
4223static int builtin_pwd(char **argv ATTRIBUTE_UNUSED) 4223static int builtin_pwd(char **argv UNUSED_PARAM)
4224{ 4224{
4225 puts(set_cwd()); 4225 puts(set_cwd());
4226 return EXIT_SUCCESS; 4226 return EXIT_SUCCESS;
diff --git a/shell/lash_unused.c b/shell/lash_unused.c
index 59199ded4..708408954 100644
--- a/shell/lash_unused.c
+++ b/shell/lash_unused.c
@@ -119,7 +119,7 @@ static void remove_job(struct jobset *j_list, struct job *job);
119static int get_command_bufsiz(FILE *source, char *command); 119static int get_command_bufsiz(FILE *source, char *command);
120static int parse_command(char **command_ptr, struct job *job, int *inbg); 120static int parse_command(char **command_ptr, struct job *job, int *inbg);
121static int run_command(struct job *newjob, int inbg, int outpipe[2]); 121static int run_command(struct job *newjob, int inbg, int outpipe[2]);
122static int pseudo_exec(struct child_prog *cmd) ATTRIBUTE_NORETURN; 122static int pseudo_exec(struct child_prog *cmd) NORETURN;
123static int busy_loop(FILE *input); 123static int busy_loop(FILE *input);
124 124
125 125
@@ -177,7 +177,7 @@ static inline void debug_printf(const char *format, ...)
177 va_end(args); 177 va_end(args);
178} 178}
179#else 179#else
180static inline void debug_printf(const char ATTRIBUTE_UNUSED *format, ...) { } 180static inline void debug_printf(const char UNUSED_PARAM *format, ...) { }
181#endif 181#endif
182 182
183/* 183/*
@@ -308,7 +308,7 @@ static int builtin_fg_bg(struct child_prog *child)
308} 308}
309 309
310/* built-in 'help' handler */ 310/* built-in 'help' handler */
311static int builtin_help(struct child_prog ATTRIBUTE_UNUSED *dummy) 311static int builtin_help(struct child_prog UNUSED_PARAM *dummy)
312{ 312{
313 const struct built_in_command *x; 313 const struct built_in_command *x;
314 314
@@ -342,7 +342,7 @@ static int builtin_jobs(struct child_prog *child)
342 342
343 343
344/* built-in 'pwd' handler */ 344/* built-in 'pwd' handler */
345static int builtin_pwd(struct child_prog ATTRIBUTE_UNUSED *dummy) 345static int builtin_pwd(struct child_prog UNUSED_PARAM *dummy)
346{ 346{
347 update_cwd(); 347 update_cwd();
348 puts(cwd); 348 puts(cwd);
diff --git a/shell/msh.c b/shell/msh.c
index 2b6b3853f..44213c657 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -45,7 +45,7 @@
45# define nonblock_safe_read(fd,buf,count) read(fd,buf,count) 45# define nonblock_safe_read(fd,buf,count) read(fd,buf,count)
46# define NOT_LONE_DASH(s) ((s)[0] != '-' || (s)[1]) 46# define NOT_LONE_DASH(s) ((s)[0] != '-' || (s)[1])
47# define LONE_CHAR(s,c) ((s)[0] == (c) && !(s)[1]) 47# define LONE_CHAR(s,c) ((s)[0] == (c) && !(s)[1])
48# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) 48# define NORETURN __attribute__ ((__noreturn__))
49static int find_applet_by_name(const char *applet) 49static int find_applet_by_name(const char *applet)
50{ 50{
51 return -1; 51 return -1;
@@ -780,7 +780,7 @@ static void closeall(void)
780 780
781 781
782/* fail but return to process next command */ 782/* fail but return to process next command */
783static void fail(void) ATTRIBUTE_NORETURN; 783static void fail(void) NORETURN;
784static void fail(void) 784static void fail(void)
785{ 785{
786 longjmp(failpt, 1); 786 longjmp(failpt, 1);
@@ -788,7 +788,7 @@ static void fail(void)
788} 788}
789 789
790/* abort shell (or fail in subshell) */ 790/* abort shell (or fail in subshell) */
791static void leave(void) ATTRIBUTE_NORETURN; 791static void leave(void) NORETURN;
792static void leave(void) 792static void leave(void)
793{ 793{
794 DBGPRINTF(("LEAVE: leave called!\n")); 794 DBGPRINTF(("LEAVE: leave called!\n"));
@@ -1450,7 +1450,7 @@ static void next(int f)
1450 PUSHIO(afile, f, filechar); 1450 PUSHIO(afile, f, filechar);
1451} 1451}
1452 1452
1453static void onintr(int s ATTRIBUTE_UNUSED) /* ANSI C requires a parameter */ 1453static void onintr(int s UNUSED_PARAM) /* ANSI C requires a parameter */
1454{ 1454{
1455 signal(SIGINT, onintr); 1455 signal(SIGINT, onintr);
1456 intr = 1; 1456 intr = 1;
@@ -1545,7 +1545,7 @@ static int gmatch(const char *s, const char *p)
1545 * shell: syntax (C version) 1545 * shell: syntax (C version)
1546 */ 1546 */
1547 1547
1548static void yyerror(const char *s) ATTRIBUTE_NORETURN; 1548static void yyerror(const char *s) NORETURN;
1549static void yyerror(const char *s) 1549static void yyerror(const char *s)
1550{ 1550{
1551 yynerrs = 1; 1551 yynerrs = 1;
@@ -1558,7 +1558,7 @@ static void yyerror(const char *s)
1558 fail(); 1558 fail();
1559} 1559}
1560 1560
1561static void zzerr(void) ATTRIBUTE_NORETURN; 1561static void zzerr(void) NORETURN;
1562static void zzerr(void) 1562static void zzerr(void)
1563{ 1563{
1564 yyerror("syntax error"); 1564 yyerror("syntax error");
@@ -3163,7 +3163,7 @@ static int run(struct ioarg *argp, int (*f) (struct ioarg *))
3163 * built-in commands: doX 3163 * built-in commands: doX
3164 */ 3164 */
3165 3165
3166static int dohelp(struct op *t ATTRIBUTE_UNUSED, char **args ATTRIBUTE_UNUSED) 3166static int dohelp(struct op *t UNUSED_PARAM, char **args UNUSED_PARAM)
3167{ 3167{
3168 int col; 3168 int col;
3169 const struct builtincmd *x; 3169 const struct builtincmd *x;
@@ -3199,12 +3199,12 @@ static int dohelp(struct op *t ATTRIBUTE_UNUSED, char **args ATTRIBUTE_UNUSED)
3199 return EXIT_SUCCESS; 3199 return EXIT_SUCCESS;
3200} 3200}
3201 3201
3202static int dolabel(struct op *t ATTRIBUTE_UNUSED, char **args ATTRIBUTE_UNUSED) 3202static int dolabel(struct op *t UNUSED_PARAM, char **args UNUSED_PARAM)
3203{ 3203{
3204 return 0; 3204 return 0;
3205} 3205}
3206 3206
3207static int dochdir(struct op *t ATTRIBUTE_UNUSED, char **args) 3207static int dochdir(struct op *t UNUSED_PARAM, char **args)
3208{ 3208{
3209 const char *cp, *er; 3209 const char *cp, *er;
3210 3210
@@ -3225,7 +3225,7 @@ static int dochdir(struct op *t ATTRIBUTE_UNUSED, char **args)
3225 return 1; 3225 return 1;
3226} 3226}
3227 3227
3228static int doshift(struct op *t ATTRIBUTE_UNUSED, char **args) 3228static int doshift(struct op *t UNUSED_PARAM, char **args)
3229{ 3229{
3230 int n; 3230 int n;
3231 3231
@@ -3244,7 +3244,7 @@ static int doshift(struct op *t ATTRIBUTE_UNUSED, char **args)
3244/* 3244/*
3245 * execute login and newgrp directly 3245 * execute login and newgrp directly
3246 */ 3246 */
3247static int dologin(struct op *t ATTRIBUTE_UNUSED, char **args) 3247static int dologin(struct op *t UNUSED_PARAM, char **args)
3248{ 3248{
3249 const char *cp; 3249 const char *cp;
3250 3250
@@ -3259,7 +3259,7 @@ static int dologin(struct op *t ATTRIBUTE_UNUSED, char **args)
3259 return 1; 3259 return 1;
3260} 3260}
3261 3261
3262static int doumask(struct op *t ATTRIBUTE_UNUSED, char **args) 3262static int doumask(struct op *t UNUSED_PARAM, char **args)
3263{ 3263{
3264 int i; 3264 int i;
3265 char *cp; 3265 char *cp;
@@ -3309,7 +3309,7 @@ static int doexec(struct op *t, char **args)
3309 return 1; 3309 return 1;
3310} 3310}
3311 3311
3312static int dodot(struct op *t ATTRIBUTE_UNUSED, char **args) 3312static int dodot(struct op *t UNUSED_PARAM, char **args)
3313{ 3313{
3314 int i; 3314 int i;
3315 const char *sp; 3315 const char *sp;
@@ -3363,7 +3363,7 @@ static int dodot(struct op *t ATTRIBUTE_UNUSED, char **args)
3363 return -1; 3363 return -1;
3364} 3364}
3365 3365
3366static int dowait(struct op *t ATTRIBUTE_UNUSED, char **args) 3366static int dowait(struct op *t UNUSED_PARAM, char **args)
3367{ 3367{
3368 int i; 3368 int i;
3369 char *cp; 3369 char *cp;
@@ -3379,7 +3379,7 @@ static int dowait(struct op *t ATTRIBUTE_UNUSED, char **args)
3379 return 0; 3379 return 0;
3380} 3380}
3381 3381
3382static int doread(struct op *t ATTRIBUTE_UNUSED, char **args) 3382static int doread(struct op *t UNUSED_PARAM, char **args)
3383{ 3383{
3384 char *cp, **wp; 3384 char *cp, **wp;
3385 int nb = 0; 3385 int nb = 0;
@@ -3406,12 +3406,12 @@ static int doread(struct op *t ATTRIBUTE_UNUSED, char **args)
3406 return nb <= 0; 3406 return nb <= 0;
3407} 3407}
3408 3408
3409static int doeval(struct op *t ATTRIBUTE_UNUSED, char **args) 3409static int doeval(struct op *t UNUSED_PARAM, char **args)
3410{ 3410{
3411 return RUN(awordlist, args + 1, wdchar); 3411 return RUN(awordlist, args + 1, wdchar);
3412} 3412}
3413 3413
3414static int dotrap(struct op *t ATTRIBUTE_UNUSED, char **args) 3414static int dotrap(struct op *t UNUSED_PARAM, char **args)
3415{ 3415{
3416 int n, i; 3416 int n, i;
3417 int resetsig; 3417 int resetsig;
@@ -3492,12 +3492,12 @@ static int getn(char *as)
3492 return n * m; 3492 return n * m;
3493} 3493}
3494 3494
3495static int dobreak(struct op *t ATTRIBUTE_UNUSED, char **args) 3495static int dobreak(struct op *t UNUSED_PARAM, char **args)
3496{ 3496{
3497 return brkcontin(args[1], 1); 3497 return brkcontin(args[1], 1);
3498} 3498}
3499 3499
3500static int docontinue(struct op *t ATTRIBUTE_UNUSED, char **args) 3500static int docontinue(struct op *t UNUSED_PARAM, char **args)
3501{ 3501{
3502 return brkcontin(args[1], 0); 3502 return brkcontin(args[1], 0);
3503} 3503}
@@ -3525,7 +3525,7 @@ static int brkcontin(char *cp, int val)
3525 /* NOTREACHED */ 3525 /* NOTREACHED */
3526} 3526}
3527 3527
3528static int doexit(struct op *t ATTRIBUTE_UNUSED, char **args) 3528static int doexit(struct op *t UNUSED_PARAM, char **args)
3529{ 3529{
3530 char *cp; 3530 char *cp;
3531 3531
@@ -3541,13 +3541,13 @@ static int doexit(struct op *t ATTRIBUTE_UNUSED, char **args)
3541 return 0; 3541 return 0;
3542} 3542}
3543 3543
3544static int doexport(struct op *t ATTRIBUTE_UNUSED, char **args) 3544static int doexport(struct op *t UNUSED_PARAM, char **args)
3545{ 3545{
3546 rdexp(args + 1, export, EXPORT); 3546 rdexp(args + 1, export, EXPORT);
3547 return 0; 3547 return 0;
3548} 3548}
3549 3549
3550static int doreadonly(struct op *t ATTRIBUTE_UNUSED, char **args) 3550static int doreadonly(struct op *t UNUSED_PARAM, char **args)
3551{ 3551{
3552 rdexp(args + 1, ronly, RONLY); 3552 rdexp(args + 1, ronly, RONLY);
3553 return 0; 3553 return 0;
@@ -3583,7 +3583,7 @@ static void badid(char *s)
3583 err(": bad identifier"); 3583 err(": bad identifier");
3584} 3584}
3585 3585
3586static int doset(struct op *t ATTRIBUTE_UNUSED, char **args) 3586static int doset(struct op *t UNUSED_PARAM, char **args)
3587{ 3587{
3588 struct var *vp; 3588 struct var *vp;
3589 char *cp; 3589 char *cp;
@@ -3658,7 +3658,7 @@ static void times_fmt(char *buf, clock_t val, unsigned clk_tck)
3658#endif 3658#endif
3659} 3659}
3660 3660
3661static int dotimes(struct op *t ATTRIBUTE_UNUSED, char **args ATTRIBUTE_UNUSED) 3661static int dotimes(struct op *t UNUSED_PARAM, char **args UNUSED_PARAM)
3662{ 3662{
3663 struct tms buf; 3663 struct tms buf;
3664 unsigned clk_tck = sysconf(_SC_CLK_TCK); 3664 unsigned clk_tck = sysconf(_SC_CLK_TCK);