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/modprobe-small.c | |
parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
download | busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2 busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip |
*: 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/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 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 | } |