aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-03-05 09:26:17 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-03-05 09:26:17 +0000
commitc5741003e9cca3c0591ff44c4f27db71aab8be30 (patch)
tree02f67954a8ec9ef9ecdb42ba834c3dcf93261c1d
parent76140a77c9c47c41f244d90d4250d77b9504f7d4 (diff)
downloadbusybox-w32-c5741003e9cca3c0591ff44c4f27db71aab8be30.tar.gz
busybox-w32-c5741003e9cca3c0591ff44c4f27db71aab8be30.tar.bz2
busybox-w32-c5741003e9cca3c0591ff44c4f27db71aab8be30.zip
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
-rw-r--r--modutils/Config.in7
-rw-r--r--modutils/modutils.c2
-rw-r--r--modutils/modutils.h21
3 files changed, 12 insertions, 18 deletions
diff --git a/modutils/Config.in b/modutils/Config.in
index ce3bce1d8..ef8d9692a 100644
--- a/modutils/Config.in
+++ b/modutils/Config.in
@@ -44,7 +44,6 @@ config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
44 depends on MODPROBE_SMALL 44 depends on MODPROBE_SMALL
45 help 45 help
46 Allow insmod and modprobe take module options from command line. 46 Allow insmod and modprobe take module options from command line.
47 N.B. Very bloaty.
48 47
49config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED 48config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
50 bool "Skip loading of already loaded modules" 49 bool "Skip loading of already loaded modules"
@@ -52,7 +51,6 @@ config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
52 depends on MODPROBE_SMALL 51 depends on MODPROBE_SMALL
53 help 52 help
54 Check if the module is already loaded. 53 Check if the module is already loaded.
55 N.B. It's racy.
56 54
57config INSMOD 55config INSMOD
58 bool "insmod" 56 bool "insmod"
@@ -92,9 +90,6 @@ config MODPROBE
92 Handle the loading of modules, and their dependencies on a high 90 Handle the loading of modules, and their dependencies on a high
93 level. 91 level.
94 92
95 Note that in the state, modprobe does not understand multiple
96 module options from the configuration file. See option below.
97
98config FEATURE_MODPROBE_BLACKLIST 93config FEATURE_MODPROBE_BLACKLIST
99 bool 94 bool
100 prompt "Blacklist support" 95 prompt "Blacklist support"
@@ -143,7 +138,7 @@ config FEATURE_INSMOD_KSYMOOPS_SYMBOLS
143 By adding module symbols to the kernel symbol table, Oops messages 138 By adding module symbols to the kernel symbol table, Oops messages
144 occuring within kernel modules can be properly debugged. By enabling 139 occuring within kernel modules can be properly debugged. By enabling
145 this feature, module symbols will always be added to the kernel symbol 140 this feature, module symbols will always be added to the kernel symbol
146 table for properly debugging support. If you are not interested in 141 table for proper debugging support. If you are not interested in
147 Oops messages from kernel modules, say N. 142 Oops messages from kernel modules, say N.
148 143
149config FEATURE_INSMOD_LOADINKMEM 144config FEATURE_INSMOD_LOADINKMEM
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 8836f7c69..5a4ba84e7 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -17,8 +17,6 @@ extern int delete_module(const char *module, unsigned int flags);
17# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) 17# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
18#endif 18#endif
19 19
20USE_FEATURE_2_4_MODULES(char *insmod_outputname);
21
22/* 20/*
23 a libbb candidate from ice age! 21 a libbb candidate from ice age!
24*/ 22*/
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;
27char *filename2modname(const char *filename, char *modname) FAST_FUNC; 27char *filename2modname(const char *filename, char *modname) FAST_FUNC;
28char *parse_cmdline_module_options(char **argv) FAST_FUNC; 28char *parse_cmdline_module_options(char **argv) FAST_FUNC;
29 29
30#define INSMOD_OPTS "vq" USE_FEATURE_2_4_MODULES("sLo:fkx") \ 30#define INSMOD_OPTS \
31 "vq" \
32 USE_FEATURE_2_4_MODULES("sLo:fkx") \
31 USE_FEATURE_INSMOD_LOAD_MAP("m") 33 USE_FEATURE_INSMOD_LOAD_MAP("m")
32#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, &insmod_outputname) 34
35#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL)
33 36
34enum { 37enum {
35 INSMOD_OPT_VERBOSE = 0x0001, 38 INSMOD_OPT_VERBOSE = 0x0001,
@@ -42,13 +45,13 @@ enum {
42 INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES, 45 INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES,
43 INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP, 46 INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP,
44#if ENABLE_FEATURE_2_4_MODULES 47#if ENABLE_FEATURE_2_4_MODULES
45#if ENABLE_FEATURE_INSMOD_LOAD_MAP 48# if ENABLE_FEATURE_INSMOD_LOAD_MAP
46 INSMOD_OPT_UNUSED = 0x0200, 49 INSMOD_OPT_UNUSED = 0x0200,
47#else /* ENABLE_FEATURE_INSMOD_LOAD_MAP */ 50# else
48 INSMOD_OPT_UNUSED = 0x0100 51 INSMOD_OPT_UNUSED = 0x0100,
49#endif 52# endif
50#else /* ENABLE_FEATURE_2_4_MODULES */ 53#else
51 INSMOD_OPT_UNUSED = 0x0004 54 INSMOD_OPT_UNUSED = 0x0004,
52#endif 55#endif
53}; 56};
54 57
@@ -56,8 +59,6 @@ int FAST_FUNC bb_init_module(const char *module, const char *options);
56int FAST_FUNC bb_delete_module(const char *module, unsigned int flags); 59int FAST_FUNC bb_delete_module(const char *module, unsigned int flags);
57 60
58#if ENABLE_FEATURE_2_4_MODULES 61#if ENABLE_FEATURE_2_4_MODULES
59extern char *insmod_outputname;
60
61int FAST_FUNC bb_init_module_24(const char *module, const char *options); 62int FAST_FUNC bb_init_module_24(const char *module, const char *options);
62#endif 63#endif
63 64