aboutsummaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
commita60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
treef59bc665cfe3d2d32622450d80523e3c1265e501 /selinux
parentf6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
downloadbusybox-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz
busybox-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'selinux')
-rw-r--r--selinux/chcon.c8
-rw-r--r--selinux/getenforce.c2
-rw-r--r--selinux/load_policy.c2
-rw-r--r--selinux/matchpathcon.c2
-rw-r--r--selinux/runcon.c2
-rw-r--r--selinux/selinuxenabled.c2
-rw-r--r--selinux/sestatus.c2
-rw-r--r--selinux/setfiles.c6
8 files changed, 13 insertions, 13 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 505ae4f32..80a030fde 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 a39ce6d2b..21075cfd8 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 c5b0e7a1b..b7a5c6eef 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 e0b374add..5cfd52aba 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 0f573d1ec..a9471ef0c 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 c6e947ce5..ea233d891 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 ec39afc21..3b027eeb2 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 991c13cd7..d567f83aa 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 */