From b9f2d9f7d9b4a9b6fbb6a28a8c0bcf8e0e3b1704 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 18 Jan 2011 13:58:01 +0100 Subject: mass removal of underscores from _BB_DIR_foo and _BB_SUID_foo Signed-off-by: Denys Vlasenko --- modutils/depmod.c | 2 +- modutils/insmod.c | 2 +- modutils/lsmod.c | 2 +- modutils/modinfo.c | 2 +- modutils/modprobe-small.c | 10 +++++----- modutils/modprobe.c | 2 +- modutils/rmmod.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'modutils') diff --git a/modutils/depmod.c b/modutils/depmod.c index 85b64a229..f6c0bf33a 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -8,7 +8,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP)) //usage:#if !ENABLE_MODPROBE_SMALL //usage:#define depmod_trivial_usage NOUSAGE_STR diff --git a/modutils/insmod.c b/modutils/insmod.c index 7ec3cae47..e5b46f402 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -7,7 +7,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_INSMOD(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP)) #include "libbb.h" #include "modutils.h" diff --git a/modutils/lsmod.c b/modutils/lsmod.c index d7e16689b..3b3c166b9 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -8,7 +8,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_LSMOD(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP)) //usage:#if !ENABLE_MODPROBE_SMALL //usage:#define lsmod_trivial_usage diff --git a/modutils/modinfo.c b/modutils/modinfo.c index 37ba77edf..731fc0553 100644 --- a/modutils/modinfo.c +++ b/modutils/modinfo.c @@ -6,7 +6,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 188a7f229..2a69eb513 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -8,11 +8,11 @@ * Licensed under GPLv2, see file LICENSE in this source tree. */ -//applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) -//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) -//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) -//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) -//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) #include "libbb.h" /* After libbb.h, since it needs sys/types.h on some systems */ diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 73df39c6c..e3bacac56 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -8,7 +8,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)) #include "libbb.h" #include "modutils.h" diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 2486511d7..65a4911cd 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c @@ -8,7 +8,7 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP)) //usage:#if !ENABLE_MODPROBE_SMALL //usage:#define rmmod_trivial_usage -- cgit v1.2.3