*: 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!
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user