aboutsummaryrefslogtreecommitdiff
path: root/modutils/modutils.h
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-05 09:26:17 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2009-03-05 09:26:17 +0000
commitc5741003e9cca3c0591ff44c4f27db71aab8be30 (patch)
tree02f67954a8ec9ef9ecdb42ba834c3dcf93261c1d /modutils/modutils.h
parent76140a77c9c47c41f244d90d4250d77b9504f7d4 (diff)
downloadbusybox-c5741003e9cca3c0591ff44c4f27db71aab8be30.tar.gz
busybox-c5741003e9cca3c0591ff44c4f27db71aab8be30.tar.bz2
modutils: delete unused global variable
function old new delta modprobe_main 570 567 -3 insmod_main 101 98 -3 insmod_outputname 4 - -4 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 0/2 up/down: 0/-10) Total: -10 bytes text data bss dec hex filename 816784 476 7892 825152 c9740 busybox_old 816778 476 7888 825142 c9736 busybox_unstripped
Diffstat (limited to 'modutils/modutils.h')
-rw-r--r--modutils/modutils.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/modutils/modutils.h b/modutils/modutils.h
index cc7c65351..0a29ff240 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -27,9 +27,12 @@ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
char *filename2modname(const char *filename, char *modname) FAST_FUNC;
char *parse_cmdline_module_options(char **argv) FAST_FUNC;
-#define INSMOD_OPTS "vq" USE_FEATURE_2_4_MODULES("sLo:fkx") \
+#define INSMOD_OPTS \
+ "vq" \
+ USE_FEATURE_2_4_MODULES("sLo:fkx") \
USE_FEATURE_INSMOD_LOAD_MAP("m")
-#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, &insmod_outputname)
+
+#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL)
enum {
INSMOD_OPT_VERBOSE = 0x0001,
@@ -42,13 +45,13 @@ enum {
INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES,
INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP,
#if ENABLE_FEATURE_2_4_MODULES
-#if ENABLE_FEATURE_INSMOD_LOAD_MAP
+# if ENABLE_FEATURE_INSMOD_LOAD_MAP
INSMOD_OPT_UNUSED = 0x0200,
-#else /* ENABLE_FEATURE_INSMOD_LOAD_MAP */
- INSMOD_OPT_UNUSED = 0x0100
-#endif
-#else /* ENABLE_FEATURE_2_4_MODULES */
- INSMOD_OPT_UNUSED = 0x0004
+# else
+ INSMOD_OPT_UNUSED = 0x0100,
+# endif
+#else
+ INSMOD_OPT_UNUSED = 0x0004,
#endif
};
@@ -56,8 +59,6 @@ int FAST_FUNC bb_init_module(const char *module, const char *options);
int FAST_FUNC bb_delete_module(const char *module, unsigned int flags);
#if ENABLE_FEATURE_2_4_MODULES
-extern char *insmod_outputname;
-
int FAST_FUNC bb_init_module_24(const char *module, const char *options);
#endif