aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c2
-rw-r--r--modutils/modprobe-small.c8
-rw-r--r--modutils/modprobe.c2
-rw-r--r--modutils/modutils.h6
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)
24 * or in $MODPATH. 24 * or in $MODPATH.
25 */ 25 */
26 26
27 USE_FEATURE_2_4_MODULES( 27 IF_FEATURE_2_4_MODULES(
28 getopt32(argv, INSMOD_OPTS INSMOD_ARGS); 28 getopt32(argv, INSMOD_OPTS INSMOD_ARGS);
29 argv += optind - 1; 29 argv += optind - 1;
30 ); 30 );
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)
679{ 679{
680 struct utsname uts; 680 struct utsname uts;
681 char applet0 = applet_name[0]; 681 char applet0 = applet_name[0];
682 USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;) 682 IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
683 683
684 /* are we lsmod? -> just dump /proc/modules */ 684 /* are we lsmod? -> just dump /proc/modules */
685 if ('l' == applet0) { 685 if ('l' == applet0) {
@@ -773,8 +773,8 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
773 len = MAXINT(ssize_t); 773 len = MAXINT(ssize_t);
774 map = xmalloc_xopen_read_close(*argv, &len); 774 map = xmalloc_xopen_read_close(*argv, &len);
775 if (init_module(map, len, 775 if (init_module(map, len,
776 USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") 776 IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
777 SKIP_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") 777 IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
778 ) != 0) 778 ) != 0)
779 bb_error_msg_and_die("can't insert '%s': %s", 779 bb_error_msg_and_die("can't insert '%s': %s",
780 *argv, moderror(errno)); 780 *argv, moderror(errno));
@@ -791,7 +791,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
791 } while (*argv); 791 } while (*argv);
792 792
793 if (ENABLE_FEATURE_CLEAN_UP) { 793 if (ENABLE_FEATURE_CLEAN_UP) {
794 USE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);) 794 IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(free(options);)
795 } 795 }
796 return EXIT_SUCCESS; 796 return EXIT_SUCCESS;
797} 797}
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. */
33 llist_t *deps; /* strings. modules we depend on */ 33 llist_t *deps; /* strings. modules we depend on */
34}; 34};
35 35
36#define MODPROBE_OPTS "acdlnrt:VC:" USE_FEATURE_MODPROBE_BLACKLIST("b") 36#define MODPROBE_OPTS "acdlnrt:VC:" IF_FEATURE_MODPROBE_BLACKLIST("b")
37enum { 37enum {
38 MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ 38 MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */
39 MODPROBE_OPT_DUMP_ONLY = (INSMOD_OPT_UNUSED << 1), /* c */ 39 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;
26 26
27#define INSMOD_OPTS \ 27#define INSMOD_OPTS \
28 "vq" \ 28 "vq" \
29 USE_FEATURE_2_4_MODULES("sLo:fkx") \ 29 IF_FEATURE_2_4_MODULES("sLo:fkx") \
30 USE_FEATURE_INSMOD_LOAD_MAP("m") 30 IF_FEATURE_INSMOD_LOAD_MAP("m")
31 31
32#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL) 32#define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL)
33 33
34enum { 34enum {
35 INSMOD_OPT_VERBOSE = 0x0001, 35 INSMOD_OPT_VERBOSE = 0x0001,