libbb: shrink recursive_action() by reducing memory pressure

function                                             old     new   delta
recursive_action1                                      -     316    +316
file_action_grep                                     161     164      +3
add_to_prg_cache_if_socket                           202     205      +3
depmod_main                                          509     511      +2
writeFileToTarball                                   488     489      +1
parse_module                                         281     282      +1
fileAction                                           207     208      +1
act                                                  189     190      +1
add_to_dirlist                                        65      64      -1
writeTarFile                                         196     194      -2
uuidcache_init                                        47      45      -2
uuidcache_check_device                               109     107      -2
true_action                                            8       6      -2
run_parts_main                                       310     308      -2
netstat_main                                         534     532      -2
lsusb_main                                            29      27      -2
lspci_main                                            45      43      -2
initial_scan                                         138     136      -2
grep_main                                            845     843      -2
find_main                                            482     480      -2
config_file_action                                   437     435      -2
chmod_main                                           142     140      -2
dirAction                                             14      10      -4
diff_main                                           1544    1540      -4
chown_main                                           154     148      -6
skip_dir                                             136     129      -7
dir_act                                              191     184      -7
recursive_action                                     453      69    -384
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 7/20 up/down: 328/-439)        Total: -111 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

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;