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.

---
 sysklogd/klogd.c   | 2 +-
 sysklogd/logread.c | 6 +++---
 sysklogd/syslogd.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sysklogd')

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index e719001cf..c4bbf1558 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -39,7 +39,7 @@ enum {
 };
 
 int klogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int klogd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int klogd_main(int argc UNUSED_PARAM, char **argv)
 {
 	int i = 0;
 	char *start;
diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 1753ce324..603a3776c 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -43,7 +43,7 @@ struct globals {
 	memcpy(SMrup, init_sem, sizeof(init_sem)); \
 } while (0)
 
-static void error_exit(const char *str) ATTRIBUTE_NORETURN;
+static void error_exit(const char *str) NORETURN;
 static void error_exit(const char *str)
 {
 	//release all acquired resources
@@ -60,7 +60,7 @@ static void sem_up(int semid)
 		error_exit("semop[SMrup]");
 }
 
-static void interrupted(int sig ATTRIBUTE_UNUSED)
+static void interrupted(int sig UNUSED_PARAM)
 {
 	signal(SIGINT, SIG_IGN);
 	shmdt(shbuf);
@@ -68,7 +68,7 @@ static void interrupted(int sig ATTRIBUTE_UNUSED)
 }
 
 int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int logread_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int logread_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned cur;
 	int log_semid; /* ipc semaphore id */
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index b9af9c55f..4c9efd8ba 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -541,7 +541,7 @@ static int try_to_resolve_remote(void)
 }
 #endif
 
-static void do_syslogd(void) ATTRIBUTE_NORETURN;
+static void do_syslogd(void) NORETURN;
 static void do_syslogd(void)
 {
 	int sock_fd;
@@ -638,7 +638,7 @@ static void do_syslogd(void)
 }
 
 int syslogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int syslogd_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int syslogd_main(int argc UNUSED_PARAM, char **argv)
 {
 	char OPTION_DECL;
 
-- 
cgit v1.2.3