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>

1 files changed, 7 insertions, 5 deletions

diff --git a/modutils/depmod.c b/modutils/depmod.c
index 318e7cdc7..bb42bbefe 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -32,10 +32,11 @@
  *   for each depends, look through our list of full paths and emit if found
  */
 
-static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
-                                void *data, int depth UNUSED_PARAM)
+static int FAST_FUNC parse_module(struct recursive_state *state,
+                const char *fname,
+                struct stat *sb UNUSED_PARAM)
 {
-        module_db *modules = data;
+        module_db *modules = state->userData;
         char *image, *ptr;
         module_entry *e;
 
@@ -201,11 +202,12 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
         memset(&modules, 0, sizeof(modules));
         if (*argv) {
                 do {
-                        parse_module(*argv, /*sb (unused):*/ NULL, &modules, 0);
+                        recursive_action(*argv, 0 /* no ACTION_RECURSE! */,
+                                parse_module, NULL, &modules);
                 } while (*++argv);
         } else {
                 recursive_action(".", ACTION_RECURSE,
-                                parse_module, NULL, &modules, 0);
+                                parse_module, NULL, &modules);
         }
 
         /* Generate dependency and alias files */