diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /modutils | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 2 | ||||
| -rw-r--r-- | modutils/modprobe-small.c | 8 | ||||
| -rw-r--r-- | modutils/modprobe.c | 2 | ||||
| -rw-r--r-- | modutils/modutils.h | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 90ed87a72..c4fb9279d 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -24,7 +24,7 @@ int insmod_main(int argc UNUSED_PARAM, char **argv) * or in $MODPATH. */ - USE_FEATURE_2_4_MODULES( + IF_FEATURE_2_4_MODULES( getopt32(argv, INSMOD_OPTS INSMOD_ARGS); argv += optind - 1; ); diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 6eb950f32..3fd7bf5ad 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -679,7 +679,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) { struct utsname uts; char applet0 = applet_name[0]; - USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;) + IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;) /* are we lsmod? -> just dump /proc/modules */ if ('l' == applet0) { @@ -773,8 +773,8 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) len = MAXINT(ssize_t); map = xmalloc_xopen_read_close(*argv, &len); if (init_module(map, len, - USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") - SKIP_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") + IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") + IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") ) != 0) bb_error_msg_and_die("can't insert '%s': %s", *argv, moderror(errno)); @@ -791,7 +791,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) } while (*argv); if (ENABLE_FEATURE_CLEAN_UP) { - USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);) + IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);) } return EXIT_SUCCESS; } diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 218a898a8..3474964f8 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -33,7 +33,7 @@ struct module_entry { /* I'll call it ME. */ llist_t *deps; /* strings. modules we depend on */ }; -#define MODPROBE_OPTS "acdlnrt:VC:" USE_FEATURE_MODPROBE_BLACKLIST("b") +#define MODPROBE_OPTS "acdlnrt:VC:" IF_FEATURE_MODPROBE_BLACKLIST("b") enum { MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ MODPROBE_OPT_DUMP_ONLY = (INSMOD_OPT_UNUSED << 1), /* c */ diff --git a/modutils/modutils.h b/modutils/modutils.h index 5104f1b6e..8cca5ccfe 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h @@ -26,10 +26,10 @@ char *parse_cmdline_module_options(char **argv) FAST_FUNC; #define INSMOD_OPTS \ "vq" \ - USE_FEATURE_2_4_MODULES("sLo:fkx") \ - USE_FEATURE_INSMOD_LOAD_MAP("m") + IF_FEATURE_2_4_MODULES("sLo:fkx") \ + IF_FEATURE_INSMOD_LOAD_MAP("m") -#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL) +#define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL) enum { INSMOD_OPT_VERBOSE = 0x0001, |