modules: remove an unused define and assert if we try to add too many shortcuts.

In fact the cache loader does only load less than MODULE_SHORTCUT_MAX shortcuts.

diff --git a/src/modules/entry.c b/src/modules/entry.c
index df7277bd5de06c00b510866bb28f74a18decf912..cf99b081adb8d244619536b1380f8c1cd6d58349 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -189,6 +189,9 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
         {
             unsigned i_shortcuts = va_arg (ap, unsigned);
             unsigned index = module->i_shortcuts;
+            /* The cache loader accept only a small number of shortcuts */
+            assert(i_shortcuts + index <= MODULE_SHORTCUT_MAX);
+
             const char *const *tab = va_arg (ap, const char *const *);
             const char **pp = realloc (module->pp_shortcuts,
                                        sizeof (pp[0]) * (index + i_shortcuts));

diff --git a/src/modules/modules.h b/src/modules/modules.h
index a566019ffdbf698c3ef7469c670e7d1598c15b7c..60b00eee01a83149e705f696f38019085381b375 100644 (file)
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -28,10 +28,6 @@
 #ifndef LIBVLC_MODULES_H
 # define LIBVLC_MODULES_H 1
 
-
-/* Number of tries before we unload an unused module */
-#define MODULE_HIDE_DELAY 50
-
 /*****************************************************************************
  * module_bank_t: the module bank
  *****************************************************************************