From a60f84ebf07863e390b72a2b6150e461a1ec18e9 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 5 Jul 2008 09:18:54 +0000
Subject: *: rename ATTRIBUTE_XXX to just XXX.

---
 console-tools/clear.c      | 2 +-
 console-tools/deallocvt.c  | 2 +-
 console-tools/dumpkmap.c   | 2 +-
 console-tools/kbd_mode.c   | 2 +-
 console-tools/loadfont.c   | 2 +-
 console-tools/loadkmap.c   | 2 +-
 console-tools/openvt.c     | 2 +-
 console-tools/reset.c      | 2 +-
 console-tools/resize.c     | 4 ++--
 console-tools/setconsole.c | 2 +-
 console-tools/setlogcons.c | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'console-tools')

diff --git a/console-tools/clear.c b/console-tools/clear.c
index 0d94e35b8..8b727b39b 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -13,7 +13,7 @@
 #include "libbb.h"
 
 int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int clear_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int clear_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	return printf("\033[H\033[J") != 6;
 }
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 1200cae1d..e9a3989c7 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -16,7 +16,7 @@
 enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
 
 int deallocvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int deallocvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int deallocvt_main(int argc UNUSED_PARAM, char **argv)
 {
 	/* num = 0 deallocate all unused consoles */
 	int num = 0;
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 1adfdd738..1d6bbdc63 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -24,7 +24,7 @@ struct kbentry {
 #define MAX_NR_KEYMAPS 256
 
 int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dumpkmap_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv)
+int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	struct kbentry ke;
 	int i, j, fd;
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 161495719..e15588137 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -14,7 +14,7 @@
 #include <linux/kd.h>
 
 int kbd_mode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int kbd_mode_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
 {
 	int fd;
 	unsigned opt;
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 843f4b035..48b298002 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -167,7 +167,7 @@ static void loadnewfont(int fd)
 }
 
 int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int loadfont_main(int argc, char **argv ATTRIBUTE_UNUSED)
+int loadfont_main(int argc, char **argv UNUSED_PARAM)
 {
 	int fd;
 
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 28e53ebca..b891c9b0e 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -26,7 +26,7 @@ struct kbentry {
 #define MAX_NR_KEYMAPS  256
 
 int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int loadkmap_main(int ATTRIBUTE_UNUSED argc, char **argv ATTRIBUTE_UNUSED)
+int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	struct kbentry ke;
 	int i, j, fd;
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 208522418..0906de46f 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -105,7 +105,7 @@ static NOINLINE void vfork_child(char **argv)
 }
 
 int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int openvt_main(int argc UNUSED_PARAM, char **argv)
 {
 	char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];
 	struct vt_stat vtstat;
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 5d5d4e27b..6917eda42 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -18,7 +18,7 @@ int stty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #endif
 
 int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int reset_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	static const char *const args[] = {
 		"stty", "sane", NULL
diff --git a/console-tools/resize.c b/console-tools/resize.c
index 8a50f9dcd..ea7fe5fca 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -14,14 +14,14 @@
 #define old_termios (*(struct termios*)&bb_common_bufsiz1)
 
 static void
-onintr(int sig ATTRIBUTE_UNUSED)
+onintr(int sig UNUSED_PARAM)
 {
 	tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
 	exit(EXIT_FAILURE);
 }
 
 int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int resize_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	struct termios new;
 	struct winsize w = { 0, 0, 0, 0 };
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 82fe83f22..b685937ae 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -11,7 +11,7 @@
 #include "libbb.h"
 
 int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int setconsole_main(int ATTRIBUTE_UNUSED argc, char **argv)
+int setconsole_main(int argc UNUSED_PARAM, char **argv)
 {
 	const char *device = CURRENT_TTY;
 	bool reset;
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c
index aa8e0806f..dd44591a3 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -12,7 +12,7 @@
 #include "libbb.h"
 
 int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int setlogcons_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int setlogcons_main(int argc UNUSED_PARAM, char **argv)
 {
 	struct {
 		char fn;
-- 
cgit v1.2.3