10 files changed, 15 insertions, 15 deletions

diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 863ccdf72..89414d738 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -123,7 +123,7 @@ static void add_user_to_group(char **args,
  * will add an existing user to an existing group.
  */
 int addgroup_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int addgroup_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int addgroup_main(int argc UNUSED_PARAM, char **argv)
 {
         char *group;
         gid_t gid = 0;
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index cd68015d1..3154806b6 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -56,7 +56,7 @@ static void addgroup_wrapper(struct passwd *p)
         free(cmd);
 }
 
-static void passwd_wrapper(const char *login) ATTRIBUTE_NORETURN;
+static void passwd_wrapper(const char *login) NORETURN;
 
 static void passwd_wrapper(const char *login)
 {
@@ -85,7 +85,7 @@ static const char adduser_longopts[] ALIGN1 =
  * can be customized via command-line parameters.
  */
 int adduser_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int adduser_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int adduser_main(int argc UNUSED_PARAM, char **argv)
 {
         struct passwd pw;
         const char *usegroup = NULL;
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 7308596ad..25145fd1c 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -19,7 +19,7 @@ static const char chpasswd_longopts[] ALIGN1 =
 #define OPT_MD5         2
 
 int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int chpasswd_main(int argc UNUSED_PARAM, char **argv)
 {
         char *name, *pass;
         char salt[sizeof("$N$XXXXXXXX")];
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c
index 901f6fcde..db5d95920 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -32,7 +32,7 @@ done
  */
 
 int cryptpw_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cryptpw_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int cryptpw_main(int argc UNUSED_PARAM, char **argv)
 {
         char salt[sizeof("$N$XXXXXXXX")];
         char *opt_a;
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 13a8c0c6c..7d4fe4df9 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -620,7 +620,7 @@ static void update_utmp(const char *line, char *fakehost)
 #endif /* CONFIG_FEATURE_UTMP */
 
 int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int getty_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int getty_main(int argc UNUSED_PARAM, char **argv)
 {
         int n;
         char *fakehost = NULL;          /* Fake hostname for ut_host */
diff --git a/loginutils/login.c b/loginutils/login.c
index d9a2f8a41..9c7941e0d 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -206,7 +206,7 @@ static void motd(void)
         }
 }
 
-static void alarm_handler(int sig ATTRIBUTE_UNUSED)
+static void alarm_handler(int sig UNUSED_PARAM)
 {
         /* This is the escape hatch!  Poor serial line users and the like
          * arrive here when their connection is broken.
@@ -221,7 +221,7 @@ static void alarm_handler(int sig ATTRIBUTE_UNUSED)
 }
 
 int login_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int login_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int login_main(int argc UNUSED_PARAM, char **argv)
 {
         enum {
                 LOGIN_OPT_f = (1<<0),
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 0a31137cf..84e5aeb6d 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -71,7 +71,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
 }
 
 int passwd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int passwd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int passwd_main(int argc UNUSED_PARAM, char **argv)
 {
         enum {
                 OPT_algo = 0x1, /* -a - password algorithm */
diff --git a/loginutils/su.c b/loginutils/su.c
index 1a35f0e4f..61039d823 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -12,7 +12,7 @@
 #define SU_OPT_l (4)
 
 int su_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int su_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int su_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned flags;
         char *opt_shell = NULL;
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 38812a6cc..bfd42569a 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -8,14 +8,14 @@
 #include "libbb.h"
 #include <syslog.h>
 
-//static void catchalarm(int ATTRIBUTE_UNUSED junk)
+//static void catchalarm(int UNUSED_PARAM junk)
 //{
 //      exit(EXIT_FAILURE);
 //}
 
 
 int sulogin_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int sulogin_main(int argc UNUSED_PARAM, char **argv)
 {
         char *cp;
         int timeout = 0;
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 3ce40dd62..442272a05 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -18,21 +18,21 @@
 #include <sys/vt.h>
 #include "libbb.h"
 
-static void release_vt(int signo ATTRIBUTE_UNUSED)
+static void release_vt(int signo UNUSED_PARAM)
 {
         /* If -a, param is 0, which means:
          * "no, kernel, we don't allow console switch away from us!" */
         ioctl(STDIN_FILENO, VT_RELDISP, (unsigned long) !option_mask32);
 }
 
-static void acquire_vt(int signo ATTRIBUTE_UNUSED)
+static void acquire_vt(int signo UNUSED_PARAM)
 {
         /* ACK to kernel that switch to console is successful */
         ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ);
 }
 
 int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int vlock_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int vlock_main(int argc UNUSED_PARAM, char **argv)
 {
         struct vt_mode vtm;
         struct termios term;