diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/depmod.c | 12 | ||||
| -rw-r--r-- | modutils/modprobe-small.c | 3 | ||||
| -rw-r--r-- | modutils/modprobe.c | 14 |
3 files changed, 14 insertions, 15 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 */ diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index a94b0b9a6..18cfac481 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -751,8 +751,7 @@ static int process_module(char *name, const char *cmdline_options) ACTION_RECURSE, /* flags */ fileAction, /* file action */ NULL, /* dir action */ - name, /* user data */ - 0 /* depth */ + name /* user data */ ); dbg1_error_msg("dirscan complete"); /* Module was not found, or load failed, or is_remove */ diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 70c45903a..eeeff7609 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -235,10 +235,9 @@ static void add_probe(const char *name) } } -static int FAST_FUNC config_file_action(const char *filename, - struct stat *statbuf UNUSED_PARAM, - void *userdata UNUSED_PARAM, - int depth) +static int FAST_FUNC config_file_action(struct recursive_state *state, + const char *filename, + struct stat *statbuf UNUSED_PARAM) { char *tokens[3]; parser_t *p; @@ -255,7 +254,7 @@ static int FAST_FUNC config_file_action(const char *filename, * that we shouldn't recurse into /etc/modprobe.d/dir/ * _subdirectories_: */ - if (depth > 1) + if (state->depth > 1) return SKIP; /* stop recursing */ //TODO: instead, can use dirAction in recursive_action() to SKIP dirs //on depth == 1 level. But that's more code... @@ -264,7 +263,7 @@ static int FAST_FUNC config_file_action(const char *filename, * depth==0: read_config("modules.{symbols,alias}") must work, * "include FILE_NOT_ENDING_IN_CONF" must work too. */ - if (depth != 0) { + if (state->depth != 0) { if (!is_suffixed_with(base, ".conf")) goto error; } @@ -329,8 +328,7 @@ static int FAST_FUNC config_file_action(const char *filename, static int read_config(const char *path) { return recursive_action(path, ACTION_RECURSE | ACTION_QUIET, - config_file_action, NULL, NULL, - /*depth:*/ 0); + config_file_action, NULL, NULL); } static const char *humanly_readable_name(struct module_entry *m) |