aboutsummaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:19:26 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:19:26 +0000
commit592d4fe7722b094b18194cdf6a692a71a116e4ca (patch)
treeb8a85f1bf16d7e791fe65e1231fe24eb70501162 /selinux
parent4866e905d7e1f11d86374fad4e46aa2bd669c2ba (diff)
downloadbusybox-592d4fe7722b094b18194cdf6a692a71a116e4ca.tar.gz
busybox-592d4fe7722b094b18194cdf6a692a71a116e4ca.tar.bz2
selinux/*: -Wunused-parameter fixes
runsv: make it NOMMU-capable function old new delta startservice 291 313 +22 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 22/0) Total: 22 bytes
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.c9
8 files changed, 18 insertions, 11 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index f00e24278..288e93ad3 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -28,7 +28,11 @@ static char *type = NULL;
static char *range = NULL;
static char *specified_context = NULL;
-static int change_filedir_context(const char *fname, struct stat *stbuf, void *userData, int depth)
+static int change_filedir_context(
+ const char *fname,
+ struct stat *stbuf ATTRIBUTE_UNUSED,
+ void *userData ATTRIBUTE_UNUSED,
+ int depth ATTRIBUTE_UNUSED)
{
context_t context = NULL;
security_context_t file_context = NULL;
@@ -121,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, char **argv)
+int chcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
char *reference_file;
char *fname;
diff --git a/selinux/getenforce.c b/selinux/getenforce.c
index e11e78e31..a39ce6d2b 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, char **argv)
+int getenforce_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
{
int rc;
diff --git a/selinux/load_policy.c b/selinux/load_policy.c
index f9aa49d19..c5b0e7a1b 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)
+int load_policy_main(int argc, char **argv ATTRIBUTE_UNUSED)
{
int rc;
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index 6de68bceb..e0b374add 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, char **argv)
+int matchpathcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
int error = 0;
unsigned opts;
diff --git a/selinux/runcon.c b/selinux/runcon.c
index 89a4b0555..0f573d1ec 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, char **argv)
+int runcon_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
char *role = NULL;
char *range = NULL;
diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c
index 114d2b6e2..c6e947ce5 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, char **argv)
+int selinuxenabled_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
{
return !is_selinux_enabled();
}
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index cc17b175b..43e31d455 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, char **argv)
+int sestatus_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
unsigned opts;
const char *pol_path;
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 905333f94..02bb9113f 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, ...)
+static void qprintf(const char *fmt ATTRIBUTE_UNUSED, ...)
{
/* quiet, do nothing */
}
@@ -391,8 +391,11 @@ static int restore(const char *file)
* This function is called by recursive_action on each file during
* the directory traversal.
*/
-static int apply_spec(const char *file,
- struct stat *sb, void *userData, int depth)
+static int apply_spec(
+ const char *file,
+ struct stat *sb,
+ void *userData ATTRIBUTE_UNUSED,
+ int depth ATTRIBUTE_UNUSED)
{
if (!follow_mounts) {
/* setfiles does not process across different mount points */