*: rename ATTRIBUTE_XXX to just XXX.

author: Denis Vlasenko <vda.linux@googlemail.com> 2008-07-05 09:18:54 +0000
committer: Denis Vlasenko <vda.linux@googlemail.com> 2008-07-05 09:18:54 +0000
commit: a60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
tree: f59bc665cfe3d2d32622450d80523e3c1265e501 /console-tools
parent: f6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
download: busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip
11 files changed, 12 insertions, 12 deletions
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;
author	Denis Vlasenko <vda.linux@googlemail.com>	2008-07-05 09:18:54 +0000
committer	Denis Vlasenko <vda.linux@googlemail.com>	2008-07-05 09:18:54 +0000
commit	a60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
tree	f59bc665cfe3d2d32622450d80523e3c1265e501 /console-tools
parent	f6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
download	busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2 busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip

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 @@
13	#include "libbb.h"	13	#include "libbb.h"
14		14
15	int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	15	int clear_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
16	int clear_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)	16	int clear_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
17	{	17	{
18	return printf("\033[H\033[J") != 6;	18	return printf("\033[H\033[J") != 6;
19	}	19	}


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 @@
16	enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */	16	enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
17		17
18	int deallocvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	18	int deallocvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
19	int deallocvt_main(int argc ATTRIBUTE_UNUSED, char **argv)	19	int deallocvt_main(int argc UNUSED_PARAM, char **argv)
20	{	20	{
21	/* num = 0 deallocate all unused consoles */	21	/* num = 0 deallocate all unused consoles */
22	int num = 0;	22	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 {
24	#define MAX_NR_KEYMAPS 256	24	#define MAX_NR_KEYMAPS 256
25		25
26	int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	26	int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
27	int dumpkmap_main(int ATTRIBUTE_UNUSED argc, char ATTRIBUTE_UNUSED **argv)	27	int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
28	{	28	{
29	struct kbentry ke;	29	struct kbentry ke;
30	int i, j, fd;	30	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 @@
14	#include <linux/kd.h>	14	#include <linux/kd.h>
15		15
16	int kbd_mode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	16	int kbd_mode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
17	int kbd_mode_main(int ATTRIBUTE_UNUSED argc, char **argv)	17	int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
18	{	18	{
19	int fd;	19	int fd;
20	unsigned opt;	20	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)
167	}	167	}
168		168
169	int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	169	int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
170	int loadfont_main(int argc, char **argv ATTRIBUTE_UNUSED)	170	int loadfont_main(int argc, char **argv UNUSED_PARAM)
171	{	171	{
172	int fd;	172	int fd;
173		173


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 {
26	#define MAX_NR_KEYMAPS 256	26	#define MAX_NR_KEYMAPS 256
27		27
28	int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	28	int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
29	int loadkmap_main(int ATTRIBUTE_UNUSED argc, char **argv ATTRIBUTE_UNUSED)	29	int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
30	{	30	{
31	struct kbentry ke;	31	struct kbentry ke;
32	int i, j, fd;	32	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)
105	}	105	}
106		106
107	int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	107	int openvt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
108	int openvt_main(int argc ATTRIBUTE_UNUSED, char **argv)	108	int openvt_main(int argc UNUSED_PARAM, char **argv)
109	{	109	{
110	char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];	110	char vtname[sizeof(VC_FORMAT) + sizeof(int)*3];
111	struct vt_stat vtstat;	111	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;
18	#endif	18	#endif
19		19
20	int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	20	int reset_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
21	int reset_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)	21	int reset_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
22	{	22	{
23	static const char *const args[] = {	23	static const char *const args[] = {
24	"stty", "sane", NULL	24	"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 @@
14	#define old_termios ((struct termios)&bb_common_bufsiz1)	14	#define old_termios ((struct termios)&bb_common_bufsiz1)
15		15
16	static void	16	static void
17	onintr(int sig ATTRIBUTE_UNUSED)	17	onintr(int sig UNUSED_PARAM)
18	{	18	{
19	tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);	19	tcsetattr(STDERR_FILENO, TCSANOW, &old_termios);
20	exit(EXIT_FAILURE);	20	exit(EXIT_FAILURE);
21	}	21	}
22		22
23	int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	23	int resize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
24	int resize_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)	24	int resize_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
25	{	25	{
26	struct termios new;	26	struct termios new;
27	struct winsize w = { 0, 0, 0, 0 };	27	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 @@
11	#include "libbb.h"	11	#include "libbb.h"
12		12
13	int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	13	int setconsole_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
14	int setconsole_main(int ATTRIBUTE_UNUSED argc, char **argv)	14	int setconsole_main(int argc UNUSED_PARAM, char **argv)
15	{	15	{
16	const char *device = CURRENT_TTY;	16	const char *device = CURRENT_TTY;
17	bool reset;	17	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 @@
12	#include "libbb.h"	12	#include "libbb.h"
13		13
14	int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;	14	int setlogcons_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
15	int setlogcons_main(int argc ATTRIBUTE_UNUSED, char **argv)	15	int setlogcons_main(int argc UNUSED_PARAM, char **argv)
16	{	16	{
17	struct {	17	struct {
18	char fn;	18	char fn;