diff options
| -rw-r--r-- | include/modules.h | 1 | ||||
| -rw-r--r-- | src/init.c | 2 | ||||
| -rw-r--r-- | src/modules.c | 32 |
3 files changed, 2 insertions, 33 deletions
diff --git a/include/modules.h b/include/modules.h index ad505e0e5..4931a14cf 100644 --- a/include/modules.h +++ b/include/modules.h @@ -351,7 +351,6 @@ int encryption_module_init(void); /* Load the encryption module */ int protocol_module_init(void); /* Load the IRCD Protocol Module up*/ int unloadModule(Module *m, User *u); /* Unload the given module from the pro */ int prepForUnload(Module *m); /* Prepare the module for unload */ -void modules_init(void); void moduleCallBackPrepForUnload(const char *mod_name); MDE void moduleCallBackDeleteEntry(ModuleCallBack * prev); MDE char *moduleGetLastBuffer(void); diff --git a/src/init.c b/src/init.c index 47e7cf51c..fea6f0aa0 100644 --- a/src/init.c +++ b/src/init.c @@ -529,7 +529,7 @@ int init_secondary(int ac, char **av) helpserv_init(); /* load any custom modules */ - modules_init(); + modules_core_init(ModulesNumber, ModulesAutoload); /* Initialize random number generator */ rand_init(); diff --git a/src/modules.c b/src/modules.c index e1794d3f9..bb7bc8668 100644 --- a/src/modules.c +++ b/src/modules.c @@ -171,38 +171,8 @@ static int displayMessageFromHash(const char *name) /************************************************/ - - - - - -/** - * Automaticaly load modules at startup. - * This will load modules at startup before the IRCD link is attempted, this - * allows admins to have a module relating to ircd support load - */ -void modules_init(void) -{ - int idx; - int ret; - Module *m; - - if(nothird) { - return; - } - - for (idx = 0; idx < ModulesNumber; idx++) { - m = findModule(ModulesAutoload[idx]); - if (!m) { - ret = loadModule(ModulesAutoload[idx], NULL); - mod_current_module = NULL; - mod_current_user = NULL; - } - } -} - /** - * Load up a list of core modules from the conf. + * Load up a list of modules. * @param number The number of modules to load * @param list The list of modules to load **/ |