diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
| commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
| tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /modutils/modprobe-small.c | |
| parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
| parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
| download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'modutils/modprobe-small.c')
| -rw-r--r-- | modutils/modprobe-small.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 18cfac481..db44a2ed0 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
| @@ -377,11 +377,11 @@ static int parse_module(module_info *info, const char *pathname) | |||
| 377 | return info->open_read_failed; | 377 | return info->open_read_failed; |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | static FAST_FUNC int fileAction(const char *pathname, | 380 | static FAST_FUNC int fileAction(struct recursive_state *state, |
| 381 | struct stat *sb UNUSED_PARAM, | 381 | const char *pathname, |
| 382 | void *modname_to_match, | 382 | struct stat *sb UNUSED_PARAM) |
| 383 | int depth UNUSED_PARAM) | ||
| 384 | { | 383 | { |
| 384 | const char *modname_to_match = state->userData; | ||
| 385 | int cur; | 385 | int cur; |
| 386 | const char *fname; | 386 | const char *fname; |
| 387 | bool is_remove = (ENABLE_RMMOD && ONLY_APPLET) | 387 | bool is_remove = (ENABLE_RMMOD && ONLY_APPLET) |