diff options
Diffstat (limited to 'selinux')
-rw-r--r-- | selinux/chcon.c | 8 | ||||
-rw-r--r-- | selinux/getenforce.c | 2 | ||||
-rw-r--r-- | selinux/load_policy.c | 2 | ||||
-rw-r--r-- | selinux/matchpathcon.c | 2 | ||||
-rw-r--r-- | selinux/runcon.c | 2 | ||||
-rw-r--r-- | selinux/selinuxenabled.c | 2 | ||||
-rw-r--r-- | selinux/sestatus.c | 2 | ||||
-rw-r--r-- | selinux/setfiles.c | 9 |
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; | |||
28 | static char *range = NULL; | 28 | static char *range = NULL; |
29 | static char *specified_context = NULL; | 29 | static char *specified_context = NULL; |
30 | 30 | ||
31 | static int change_filedir_context(const char *fname, struct stat *stbuf, void *userData, int depth) | 31 | static int change_filedir_context( |
32 | const char *fname, | ||
33 | struct stat *stbuf ATTRIBUTE_UNUSED, | ||
34 | void *userData ATTRIBUTE_UNUSED, | ||
35 | int depth ATTRIBUTE_UNUSED) | ||
32 | { | 36 | { |
33 | context_t context = NULL; | 37 | context_t context = NULL; |
34 | security_context_t file_context = NULL; | 38 | security_context_t file_context = NULL; |
@@ -121,7 +125,7 @@ static const char chcon_longopts[] ALIGN1 = | |||
121 | #endif | 125 | #endif |
122 | 126 | ||
123 | int chcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 127 | int chcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
124 | int chcon_main(int argc, char **argv) | 128 | int chcon_main(int argc ATTRIBUTE_UNUSED, char **argv) |
125 | { | 129 | { |
126 | char *reference_file; | 130 | char *reference_file; |
127 | char *fname; | 131 | 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 @@ | |||
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | 10 | ||
11 | int getenforce_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 11 | int getenforce_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
12 | int getenforce_main(int argc, char **argv) | 12 | int getenforce_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) |
13 | { | 13 | { |
14 | int rc; | 14 | int rc; |
15 | 15 | ||
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 @@ | |||
5 | #include "libbb.h" | 5 | #include "libbb.h" |
6 | 6 | ||
7 | int load_policy_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 7 | int load_policy_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
8 | int load_policy_main(int argc, char **argv) | 8 | int load_policy_main(int argc, char **argv ATTRIBUTE_UNUSED) |
9 | { | 9 | { |
10 | int rc; | 10 | int rc; |
11 | 11 | ||
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) | |||
30 | #define OPT_VERIFY (1<<4) /* -V */ | 30 | #define OPT_VERIFY (1<<4) /* -V */ |
31 | 31 | ||
32 | int matchpathcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 32 | int matchpathcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
33 | int matchpathcon_main(int argc, char **argv) | 33 | int matchpathcon_main(int argc ATTRIBUTE_UNUSED, char **argv) |
34 | { | 34 | { |
35 | int error = 0; | 35 | int error = 0; |
36 | unsigned opts; | 36 | 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 = | |||
88 | #define OPTS_CONTEXT_COMPONENT (OPTS_ROLE | OPTS_TYPE | OPTS_USER | OPTS_RANGE) | 88 | #define OPTS_CONTEXT_COMPONENT (OPTS_ROLE | OPTS_TYPE | OPTS_USER | OPTS_RANGE) |
89 | 89 | ||
90 | int runcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 90 | int runcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
91 | int runcon_main(int argc, char **argv) | 91 | int runcon_main(int argc ATTRIBUTE_UNUSED, char **argv) |
92 | { | 92 | { |
93 | char *role = NULL; | 93 | char *role = NULL; |
94 | char *range = NULL; | 94 | 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 @@ | |||
8 | #include "libbb.h" | 8 | #include "libbb.h" |
9 | 9 | ||
10 | int selinuxenabled_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 10 | int selinuxenabled_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
11 | int selinuxenabled_main(int argc, char **argv) | 11 | int selinuxenabled_main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) |
12 | { | 12 | { |
13 | return !is_selinux_enabled(); | 13 | return !is_selinux_enabled(); |
14 | } | 14 | } |
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) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | int sestatus_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 161 | int sestatus_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
162 | int sestatus_main(int argc, char **argv) | 162 | int sestatus_main(int argc ATTRIBUTE_UNUSED, char **argv) |
163 | { | 163 | { |
164 | unsigned opts; | 164 | unsigned opts; |
165 | const char *pol_path; | 165 | 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 { | |||
99 | #define FLAG_R (option_mask32 & OPT_R) | 99 | #define FLAG_R (option_mask32 & OPT_R) |
100 | 100 | ||
101 | 101 | ||
102 | static void qprintf(const char *fmt, ...) | 102 | static void qprintf(const char *fmt ATTRIBUTE_UNUSED, ...) |
103 | { | 103 | { |
104 | /* quiet, do nothing */ | 104 | /* quiet, do nothing */ |
105 | } | 105 | } |
@@ -391,8 +391,11 @@ static int restore(const char *file) | |||
391 | * This function is called by recursive_action on each file during | 391 | * This function is called by recursive_action on each file during |
392 | * the directory traversal. | 392 | * the directory traversal. |
393 | */ | 393 | */ |
394 | static int apply_spec(const char *file, | 394 | static int apply_spec( |
395 | struct stat *sb, void *userData, int depth) | 395 | const char *file, |
396 | struct stat *sb, | ||
397 | void *userData ATTRIBUTE_UNUSED, | ||
398 | int depth ATTRIBUTE_UNUSED) | ||
396 | { | 399 | { |
397 | if (!follow_mounts) { | 400 | if (!follow_mounts) { |
398 | /* setfiles does not process across different mount points */ | 401 | /* setfiles does not process across different mount points */ |