diff options
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/awk.c | 4 | ||||
| -rw-r--r-- | editors/cmp.c | 2 | ||||
| -rw-r--r-- | editors/diff.c | 6 | ||||
| -rw-r--r-- | editors/ed.c | 2 | ||||
| -rw-r--r-- | editors/patch.c | 2 | ||||
| -rw-r--r-- | editors/sed.c | 2 | ||||
| -rw-r--r-- | editors/vi.c | 6 |
7 files changed, 12 insertions, 12 deletions
diff --git a/editors/awk.c b/editors/awk.c index aac40aa..2af3988 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -499,7 +499,7 @@ static void chain_group(void); static var *evaluate(node *, var *); static rstream *next_input_file(void); static int fmt_num(char *, int, const char *, double, int); -static int awk_exit(int) ATTRIBUTE_NORETURN; +static int awk_exit(int) NORETURN; /* ---- error handling ---- */ @@ -521,7 +521,7 @@ static void zero_out_var(var * vp) memset(vp, 0, sizeof(*vp)); } -static void syntax_error(const char *const message) ATTRIBUTE_NORETURN; +static void syntax_error(const char *const message) NORETURN; static void syntax_error(const char *const message) { bb_error_msg_and_die("%s:%i: %s", g_progname, g_lineno, message); diff --git a/editors/cmp.c b/editors/cmp.c index b211adf..2e98e6e 100644 --- a/editors/cmp.c +++ b/editors/cmp.c @@ -33,7 +33,7 @@ static const char opt_chars[] ALIGN1 = "sl"; #define CMP_OPT_l (1<<1) int cmp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv) +int cmp_main(int argc UNUSED_PARAM, char **argv) { FILE *fp1, *fp2, *outfile = stdout; const char *filename1, *filename2 = "-"; diff --git a/editors/diff.c b/editors/diff.c index d7eccfb..570c4c4 100644 --- a/editors/diff.c +++ b/editors/diff.c @@ -1164,9 +1164,9 @@ static void do_diff(char *dir1, char *path1, char *dir2, char *path2) #if ENABLE_FEATURE_DIFF_DIR /* This function adds a filename to dl, the directory listing. */ static int FAST_FUNC add_to_dirlist(const char *filename, - struct stat *sb ATTRIBUTE_UNUSED, + struct stat *sb UNUSED_PARAM, void *userdata, - int depth ATTRIBUTE_UNUSED) + int depth UNUSED_PARAM) { /* +2: with space for eventual trailing NULL */ dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0])); @@ -1271,7 +1271,7 @@ static void diffdir(char *p1, char *p2) int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) +int diff_main(int argc UNUSED_PARAM, char **argv) { int gotstdin = 0; char *f1, *f2; diff --git a/editors/ed.c b/editors/ed.c index 0961cc3..9084a17 100644 --- a/editors/ed.c +++ b/editors/ed.c @@ -89,7 +89,7 @@ static char *skip_blank(const char *cp) int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ed_main(int argc ATTRIBUTE_UNUSED, char **argv) +int ed_main(int argc UNUSED_PARAM, char **argv) { INIT_G(); diff --git a/editors/patch.c b/editors/patch.c index 2bc594d..d5f6df2 100644 --- a/editors/patch.c +++ b/editors/patch.c @@ -66,7 +66,7 @@ static char *extract_filename(char *line, int patch_level, const char *pat) } int patch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int patch_main(int argc ATTRIBUTE_UNUSED, char **argv) +int patch_main(int argc UNUSED_PARAM, char **argv) { struct stat saved_stat; char *patch_line; diff --git a/editors/sed.c b/editors/sed.c index 81cc195..88bae78 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -1233,7 +1233,7 @@ static void add_cmd_block(char *cmdstr) } int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int sed_main(int argc ATTRIBUTE_UNUSED, char **argv) +int sed_main(int argc UNUSED_PARAM, char **argv) { enum { OPT_in_place = 1 << 0, diff --git a/editors/vi.c b/editors/vi.c index 81baa89..1f1d3ca 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -2141,7 +2141,7 @@ static void cookmode(void) //----- Come here when we get a window resize signal --------- #if ENABLE_FEATURE_VI_USE_SIGNALS -static void winch_sig(int sig ATTRIBUTE_UNUSED) +static void winch_sig(int sig UNUSED_PARAM) { // FIXME: do it in main loop!!! signal(SIGWINCH, winch_sig); @@ -2155,7 +2155,7 @@ static void winch_sig(int sig ATTRIBUTE_UNUSED) } //----- Come here when we get a continue signal ------------------- -static void cont_sig(int sig ATTRIBUTE_UNUSED) +static void cont_sig(int sig UNUSED_PARAM) { rawmode(); // terminal to "raw" last_status_cksum = 0; // force status update @@ -2167,7 +2167,7 @@ static void cont_sig(int sig ATTRIBUTE_UNUSED) } //----- Come here when we get a Suspend signal ------------------- -static void suspend_sig(int sig ATTRIBUTE_UNUSED) +static void suspend_sig(int sig UNUSED_PARAM) { place_cursor(rows - 1, 0, FALSE); // go to bottom of screen clear_to_eol(); // Erase to end of line |