aboutsummaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
Diffstat (limited to 'selinux')
-rw-r--r--selinux/chcon.c8
-rw-r--r--selinux/setfiles.c8
2 files changed, 6 insertions, 10 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index afe7f713d..9b13679b8 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -62,11 +62,9 @@ static char *type = NULL;
static char *range = NULL;
static char *specified_context = NULL;
-static int FAST_FUNC change_filedir_context(
+static int FAST_FUNC change_filedir_context(struct recursive_state *state UNUSED_PARAM,
const char *fname,
- struct stat *stbuf UNUSED_PARAM,
- void *userData UNUSED_PARAM,
- int depth UNUSED_PARAM)
+ struct stat *stbuf UNUSED_PARAM)
{
context_t context = NULL;
security_context_t file_context = NULL;
@@ -207,7 +205,7 @@ int chcon_main(int argc UNUSED_PARAM, char **argv)
((option_mask32 & OPT_RECURSIVE) ? ACTION_RECURSE : 0),
change_filedir_context,
change_filedir_context,
- NULL, 0) != TRUE)
+ NULL) != TRUE)
errors = 1;
}
return errors;
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 55bfb4d02..a617b95d8 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -463,11 +463,9 @@ static int restore(const char *file)
* This function is called by recursive_action on each file during
* the directory traversal.
*/
-static int FAST_FUNC apply_spec(
+static int FAST_FUNC apply_spec(struct recursive_state *state UNUSED_PARAM,
const char *file,
- struct stat *sb,
- void *userData UNUSED_PARAM,
- int depth UNUSED_PARAM)
+ struct stat *sb)
{
if (!follow_mounts) {
/* setfiles does not process across different mount points */
@@ -535,7 +533,7 @@ static int process_one(char *name)
ACTION_RECURSE,
apply_spec,
apply_spec,
- NULL, 0) != TRUE
+ NULL) != TRUE
) {
bb_error_msg("error while labeling %s", name);
goto err;