svn commit: trunk/busybox/modutils

[vda at busybox.net]

Author: vda
Date: 2009-03-05 09:26:17 +0000 (Thu, 05 Mar 2009)
New Revision: 25534

Log:
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



Modified:
   trunk/busybox/modutils/Config.in
   trunk/busybox/modutils/modutils.c
   trunk/busybox/modutils/modutils.h


Changeset:
Modified: trunk/busybox/modutils/Config.in
===================================================================
--- trunk/busybox/modutils/Config.in	2009-03-05 09:21:57 UTC (rev 25533)
+++ trunk/busybox/modutils/Config.in	2009-03-05 09:26:17 UTC (rev 25534)
@@ -44,7 +44,6 @@
 	depends on MODPROBE_SMALL
 	help
 	  Allow insmod and modprobe take module options from command line.
-	  N.B. Very bloaty.
 
 config FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	bool "Skip loading of already loaded modules"
@@ -52,7 +51,6 @@
 	depends on MODPROBE_SMALL
 	help
 	  Check if the module is already loaded.
-	  N.B. It's racy.
 
 config INSMOD
 	bool "insmod"
@@ -92,9 +90,6 @@
 	  Handle the loading of modules, and their dependencies on a high
 	  level.
 
-	  Note that in the state, modprobe does not understand multiple
-	  module options from the configuration file. See option below.
-
 config FEATURE_MODPROBE_BLACKLIST
 	bool
 	prompt "Blacklist support"
@@ -143,7 +138,7 @@
 	  By adding module symbols to the kernel symbol table, Oops messages
 	  occuring within kernel modules can be properly debugged. By enabling
 	  this feature, module symbols will always be added to the kernel symbol
-	  table for properly debugging support. If you are not interested in
+	  table for proper debugging support. If you are not interested in
 	  Oops messages from kernel modules, say N.
 
 config FEATURE_INSMOD_LOADINKMEM

Modified: trunk/busybox/modutils/modutils.c
===================================================================
--- trunk/busybox/modutils/modutils.c	2009-03-05 09:21:57 UTC (rev 25533)
+++ trunk/busybox/modutils/modutils.c	2009-03-05 09:26:17 UTC (rev 25534)
@@ -17,8 +17,6 @@
 # define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 #endif
 
-USE_FEATURE_2_4_MODULES(char *insmod_outputname);
-
 /*
  a libbb candidate from ice age!
 */

Modified: trunk/busybox/modutils/modutils.h
===================================================================
--- trunk/busybox/modutils/modutils.h	2009-03-05 09:21:57 UTC (rev 25533)
+++ trunk/busybox/modutils/modutils.h	2009-03-05 09:26:17 UTC (rev 25534)
@@ -27,10 +27,13 @@
 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,
 	INSMOD_OPT_SILENT	= 0x0002,
@@ -42,22 +45,20 @@
 	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
+# else
+	INSMOD_OPT_UNUSED	= 0x0100,
+# endif
+#else
+	INSMOD_OPT_UNUSED	= 0x0004,
 #endif
-#else /* ENABLE_FEATURE_2_4_MODULES */
-	INSMOD_OPT_UNUSED	= 0x0004
-#endif
 };
 
 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