tftp: do not risk invoking Sorcerer's Apprentice syndrome

[oweals/busybox.git] / modutils / modutils.h

diff --git a/modutils/modutils.h b/modutils/modutils.h
index 6aaf79daac3627ea530feb85aab989eaf1faeda9..8cca5ccfec2bc29fedc5b058f257537f6792e77b 100644 (file)
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -6,29 +6,30 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#ifndef __MODUTILS_H__
-#define __MODUTILS_H__
+#ifndef MODUTILS_H
+#define MODUTILS_H 1
 
 #include "libbb.h"
 
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility push(hidden)
-#endif
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* As defined in linux/include/linux/module.h */
-#define MODULE_NAME_LEN 64
+/* linux/include/linux/module.h has 64, but this is also used
+ * internally for the maximum alias name length, which can be quite long */
+#define MODULE_NAME_LEN 256
 
 const char *moderror(int err) FAST_FUNC;
-llist_t *llist_find(llist_t *first, const char *str) FAST_FUNC;
 void replace(char *s, char what, char with) FAST_FUNC;
 char *replace_underscores(char *s) FAST_FUNC;
 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") \
-       USE_FEATURE_INSMOD_LOAD_MAP("m")
-#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, &insmod_outputname)
+#define INSMOD_OPTS \
+       "vq" \
+       IF_FEATURE_2_4_MODULES("sLo:fkx") \
+       IF_FEATURE_INSMOD_LOAD_MAP("m")
+
+#define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL)
 
 enum {
        INSMOD_OPT_VERBOSE      = 0x0001,
@@ -41,13 +42,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
 };
 
@@ -55,13 +56,9 @@ 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
 
-#if __GNUC_PREREQ(4,1)
-# pragma GCC visibility pop
-#endif
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif