22 files changed, 24 insertions, 24 deletions

diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index f3aef42e3..689052e86 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -5,7 +5,7 @@
 #include "bbconfigopts.h"
 
 int bbconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bbconfig_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
         printf(bbconfig_config);
         return 0;
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 5bbbb688f..d550c7c90 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -41,7 +41,7 @@ enum {
 static /*volatile*/ smallint exitcode;
 
 // trap for critical signals
-static void signal_handler(ATTRIBUTE_UNUSED int signo)
+static void signal_handler(UNUSED_PARAM int signo)
 {
         // report I/O error condition
         exitcode = ERR_IO;
@@ -103,7 +103,7 @@ static size_t unescape(char *s, int *nocr)
 
 
 int chat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chat_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int chat_main(int argc UNUSED_PARAM, char **argv)
 {
 // should we dump device output? to what fd? by default no.
 // this can be controlled later via ECHO {ON|OFF} chat directive
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index a0f684bb3..23ef58c4d 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -41,7 +41,7 @@ static void show_min_max(int pol)
 #define OPT_o (1<<4)
 
 int chrt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chrt_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int chrt_main(int argc UNUSED_PARAM, char **argv)
 {
         pid_t pid = 0;
         unsigned opt;
diff --git a/miscutils/crond.c b/miscutils/crond.c
index ecb3a2f80..e48abf9f8 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -159,7 +159,7 @@ static void crondlog(const char *ctl, ...)
 }
 
 int crond_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int crond_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int crond_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned opt;
 
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index dc3179dac..64ea4e616 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -85,7 +85,7 @@ static int open_as_user(const struct passwd *pas, const char *file)
 }
 
 int crontab_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int crontab_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int crontab_main(int argc UNUSED_PARAM, char **argv)
 {
         const struct passwd *pas;
         const char *crontab_dir = CRONTABS;
diff --git a/miscutils/dc.c b/miscutils/dc.c
index bd93ef68b..47ec060c8 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -193,7 +193,7 @@ static char *get_token(char **buffer)
 }
 
 int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dc_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int dc_main(int argc UNUSED_PARAM, char **argv)
 {
         INIT_G();
 
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index ffc595ac9..c85ff08f3 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -741,7 +741,7 @@ static void action_permissions(const struct devfsd_notify_struct *info,
 }   /*  End Function action_permissions  */
 
 static void action_modload(const struct devfsd_notify_struct *info,
-                            const struct config_entry_struct *entry ATTRIBUTE_UNUSED)
+                            const struct config_entry_struct *entry UNUSED_PARAM)
 /*  [SUMMARY] Load a module.
     <info> The devfs change.
     <entry> The config file entry.
diff --git a/miscutils/eject.c b/miscutils/eject.c
index aa22a3a42..ff3976ebb 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -83,7 +83,7 @@ static void eject_cdrom(unsigned flags, const char *dev)
 }
 
 int eject_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int eject_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int eject_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned flags;
         const char *device;
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 07350b0cc..67847c1eb 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -355,7 +355,7 @@ static void init(const char *cfg_filename)
 
 
 int fbsplash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int fbsplash_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int fbsplash_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *fb_device, *cfg_filename, *fifo_filename;
         FILE *fp = fp; // for compiler
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index a5d5b05cd..b75da16ec 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -678,7 +678,7 @@ static const char secu_str[] ALIGN1 =
 ;
 
 // Parse 512 byte disk identification block and print much crap.
-static void identify(uint16_t *val) ATTRIBUTE_NORETURN;
+static void identify(uint16_t *val) NORETURN;
 static void identify(uint16_t *val)
 {
         uint16_t ii, jj, kk;
@@ -1908,7 +1908,7 @@ static int fromhex(unsigned char c)
         bb_error_msg_and_die("bad char: '%c' 0x%02x", c, c);
 }
 
-static void identify_from_stdin(void) ATTRIBUTE_NORETURN;
+static void identify_from_stdin(void) NORETURN;
 static void identify_from_stdin(void)
 {
         uint16_t sbuf[256];
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 0d7ad2a9d..2a1a15348 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -56,7 +56,7 @@ extern int inotify_init(void);
 extern int inotify_add_watch(int fd, const char *path, uint32_t mask);
 
 int inotifyd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int inotifyd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int inotifyd_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned mask = IN_ALL_EVENTS; // assume we want all events
         struct pollfd pfd;
diff --git a/miscutils/last.c b/miscutils/last.c
index 612f50488..8c8192bee 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -35,7 +35,7 @@
 #endif
 
 int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int last_main(int argc, char **argv ATTRIBUTE_UNUSED)
+int last_main(int argc, char **argv UNUSED_PARAM)
 {
         struct utmp ut;
         int n, file = STDIN_FILENO;
diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index 2b7fee6e5..8e63e5c3d 100644
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -148,7 +148,7 @@ static int is_runlevel_shutdown(struct utmp *ut)
 }
 
 int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int last_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int last_main(int argc UNUSED_PARAM, char **argv)
 {
         struct utmp ut;
         const char *filename = _PATH_WTMP;
diff --git a/miscutils/man.c b/miscutils/man.c
index 95cb6797b..3685be7b6 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -73,7 +73,7 @@ static int show_manpage(const char *pager, char *man_filename, int man)
 }
 
 int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int man_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int man_main(int argc UNUSED_PARAM, char **argv)
 {
         FILE *cf;
         const char *pager;
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 1608960e9..ac3e5514f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -41,7 +41,7 @@ static int xset1(int fd, struct termios *tio, const char *device)
 }
 
 int microcom_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int microcom_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int microcom_main(int argc UNUSED_PARAM, char **argv)
 {
         int sfd;
         int nfd;
diff --git a/miscutils/mt.c b/miscutils/mt.c
index c56a8e0ca..586373d13 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -81,7 +81,7 @@ static const char opcode_name[] ALIGN1 =
         "weof"            "\0";
 
 int mt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int mt_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int mt_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *file = "/dev/tape";
         struct mtop op;
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 48867b83c..94eb4522d 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -213,7 +213,7 @@ static int receive(/*int read_fd, */int file_fd)
         } /* for (;;) */
 }
 
-static void sigalrm_handler(int ATTRIBUTE_UNUSED signum)
+static void sigalrm_handler(int UNUSED_PARAM signum)
 {
 }
 
diff --git a/miscutils/setsid.c b/miscutils/setsid.c
index 014de51e5..127adf6f2 100644
--- a/miscutils/setsid.c
+++ b/miscutils/setsid.c
@@ -17,7 +17,7 @@
 #include "libbb.h"
 
 int setsid_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int setsid_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int setsid_main(int argc UNUSED_PARAM, char **argv)
 {
         if (!argv[1])
                 bb_show_usage();
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 147413741..3e02b53af 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -15,7 +15,7 @@
 #define SIZE                    8
 
 int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int strings_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int strings_main(int argc UNUSED_PARAM, char **argv)
 {
         int n, c, status = EXIT_SUCCESS;
         unsigned opt;
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 708abd9f2..3175af10d 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -40,7 +40,7 @@ static char *__from_cpuset(cpu_set_t *mask)
 
 
 int taskset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int taskset_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int taskset_main(int argc UNUSED_PARAM, char **argv)
 {
         cpu_set_t mask;
         pid_t pid = 0;
diff --git a/miscutils/time.c b/miscutils/time.c
index cce7d5b3e..d8b8aa0c5 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -396,7 +396,7 @@ static void run_command(char *const *cmd, resource_t *resp)
 }
 
 int time_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int time_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int time_main(int argc UNUSED_PARAM, char **argv)
 {
         resource_t res;
         const char *output_format = default_format;
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 4ad21cbc9..9b1a110ea 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -13,7 +13,7 @@
 #define OPT_FOREGROUND 0x01
 #define OPT_TIMER      0x02
 
-static void watchdog_shutdown(int sig ATTRIBUTE_UNUSED)
+static void watchdog_shutdown(int sig UNUSED_PARAM)
 {
         static const char V = 'V';