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

---
 selinux/chcon.c          | 8 ++++----
 selinux/getenforce.c     | 2 +-
 selinux/load_policy.c    | 2 +-
 selinux/matchpathcon.c   | 2 +-
 selinux/runcon.c         | 2 +-
 selinux/selinuxenabled.c | 2 +-
 selinux/sestatus.c       | 2 +-
 selinux/setfiles.c       | 6 +++---
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'selinux')

diff --git a/selinux/chcon.c b/selinux/chcon.c
index 505ae4f..80a030f 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -30,9 +30,9 @@ static char *specified_context = NULL;
 
 static int FAST_FUNC change_filedir_context(
 		const char *fname,
-		struct stat *stbuf ATTRIBUTE_UNUSED,
-		void *userData ATTRIBUTE_UNUSED,
-		int depth ATTRIBUTE_UNUSED)
+		struct stat *stbuf UNUSED_PARAM,
+		void *userData UNUSED_PARAM,
+		int depth UNUSED_PARAM)
 {
 	context_t context = NULL;
 	security_context_t file_context = NULL;
@@ -125,7 +125,7 @@ static const char chcon_longopts[] ALIGN1 =
 #endif
 
 int chcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int chcon_main(int argc UNUSED_PARAM, char **argv)
 {
 	char *reference_file;
 	char *fname;
diff --git a/selinux/getenforce.c b/selinux/getenforce.c
index a39ce6d..21075cf 100644
--- a/selinux/getenforce.c
+++ b/selinux/getenforce.c
@@ -9,7 +9,7 @@
 #include "libbb.h"
 
 int getenforce_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int getenforce_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int getenforce_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	int rc;
 
diff --git a/selinux/load_policy.c b/selinux/load_policy.c
index c5b0e7a..b7a5c6e 100644
--- a/selinux/load_policy.c
+++ b/selinux/load_policy.c
@@ -5,7 +5,7 @@
 #include "libbb.h"
 
 int load_policy_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int load_policy_main(int argc, char **argv ATTRIBUTE_UNUSED)
+int load_policy_main(int argc, char **argv UNUSED_PARAM)
 {
 	int rc;
 
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index e0b374a..5cfd52a 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -30,7 +30,7 @@ static int print_matchpathcon(char *path, int noprint)
 #define OPT_VERIFY      (1<<4)  /* -V */
 
 int matchpathcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int matchpathcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int matchpathcon_main(int argc UNUSED_PARAM, char **argv)
 {
 	int error = 0;
 	unsigned opts;
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 0f573d1..a9471ef 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -88,7 +88,7 @@ static const char runcon_longopts[] ALIGN1 =
 #define OPTS_CONTEXT_COMPONENT		(OPTS_ROLE | OPTS_TYPE | OPTS_USER | OPTS_RANGE)
 
 int runcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int runcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int runcon_main(int argc UNUSED_PARAM, char **argv)
 {
 	char *role = NULL;
 	char *range = NULL;
diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c
index c6e947c..ea233d8 100644
--- a/selinux/selinuxenabled.c
+++ b/selinux/selinuxenabled.c
@@ -8,7 +8,7 @@
 #include "libbb.h"
 
 int selinuxenabled_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int selinuxenabled_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
+int selinuxenabled_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
 	return !is_selinux_enabled();
 }
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index ec39afc..3b027ee 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -159,7 +159,7 @@ static void display_verbose(void)
 }
 
 int sestatus_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int sestatus_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int sestatus_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned opts;
 	const char *pol_path;
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 991c13c..d567f83 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -99,7 +99,7 @@ enum {
 #define FLAG_R               (option_mask32 & OPT_R)
 
 
-static void qprintf(const char *fmt ATTRIBUTE_UNUSED, ...)
+static void qprintf(const char *fmt UNUSED_PARAM, ...)
 {
 	/* quiet, do nothing */
 }
@@ -394,8 +394,8 @@ static int restore(const char *file)
 static int FAST_FUNC apply_spec(
 		const char *file,
 		struct stat *sb,
-		void *userData ATTRIBUTE_UNUSED,
-		int depth ATTRIBUTE_UNUSED)
+		void *userData UNUSED_PARAM,
+		int depth UNUSED_PARAM)
 {
 	if (!follow_mounts) {
 		/* setfiles does not process across different mount points */
-- 
cgit v1.1