diff options
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | include/modules.h | 8 | ||||
| -rw-r--r-- | src/botserv.c | 3 | ||||
| -rw-r--r-- | src/chanserv.c | 2 | ||||
| -rw-r--r-- | src/helpserv.c | 2 | ||||
| -rw-r--r-- | src/hostserv.c | 2 | ||||
| -rw-r--r-- | src/init.c | 2 | ||||
| -rw-r--r-- | src/memoserv.c | 2 | ||||
| -rw-r--r-- | src/modulemanager.cpp | 15 | ||||
| -rw-r--r-- | src/modules.c | 19 | ||||
| -rw-r--r-- | src/nickserv.c | 2 | ||||
| -rw-r--r-- | src/operserv.c | 2 |
12 files changed, 30 insertions, 30 deletions
diff --git a/include/extern.h b/include/extern.h index 9aa5292c3..2467bff60 100644 --- a/include/extern.h +++ b/include/extern.h @@ -714,7 +714,6 @@ E int str_is_cidr(char *str, uint32 * ip, uint32 * mask, char **host); /**** modules.c ****/ -E void modules_core_init(int number, char **list); E void modules_unload_all(bool fini, bool unload_proto); /* Read warnings near function source */ E void moduleCallBackRun(void); E void moduleCleanStruct(ModuleData **moduleData); diff --git a/include/modules.h b/include/modules.h index e421187c8..884ece7eb 100644 --- a/include/modules.h +++ b/include/modules.h @@ -136,7 +136,13 @@ struct ModuleLang_ { */ CoreExport class ModuleManager { - + public: + /** + * Load up a list of modules. + * @param total_modules The number of modules to load + * @param module_list The list of modules to load + **/ + static void LoadModuleList(int total_modules, char **module_list); }; /** Every module in Anope is actually a class. diff --git a/src/botserv.c b/src/botserv.c index 14d8249e2..13d483114 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -17,7 +17,6 @@ #include "services.h" #include "pseudo.h" - /*************************************************************************/ BotInfo *botlists[256]; /* Hash list of bots */ @@ -35,7 +34,7 @@ E void moduleAddBotServCmds(void); /*************************************************************************/ /* *INDENT-OFF* */ void moduleAddBotServCmds(void) { - modules_core_init(BotServCoreNumber, BotServCoreModules); + ModuleManager::LoadModuleList(BotServCoreNumber, BotServCoreModules); } /* *INDENT-ON* */ /*************************************************************************/ diff --git a/src/chanserv.c b/src/chanserv.c index c20c39265..5e92ce3dc 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -119,7 +119,7 @@ CSModeUtil csmodeutils[] = { /*************************************************************************/ void moduleAddChanServCmds(void) { - modules_core_init(ChanServCoreNumber, ChanServCoreModules); + ModuleManager::LoadModuleList(ChanServCoreNumber, ChanServCoreModules); } /* *INDENT-ON* */ diff --git a/src/helpserv.c b/src/helpserv.c index b3ca08929..36074f3b9 100644 --- a/src/helpserv.c +++ b/src/helpserv.c @@ -26,7 +26,7 @@ void moduleAddHelpServCmds(void); */ void moduleAddHelpServCmds(void) { - modules_core_init(HelpServCoreNumber, HelpServCoreModules); + ModuleManager::LoadModuleList(HelpServCoreNumber, HelpServCoreModules); } /*************************************************************************/ diff --git a/src/hostserv.c b/src/hostserv.c index dd98d279f..b7074bc83 100644 --- a/src/hostserv.c +++ b/src/hostserv.c @@ -33,7 +33,7 @@ E void moduleAddHostServCmds(void); void moduleAddHostServCmds(void) { - modules_core_init(HostServCoreNumber, HostServCoreModules); + ModuleManager::LoadModuleList(HostServCoreNumber, HostServCoreModules); } /*************************************************************************/ diff --git a/src/init.c b/src/init.c index fea6f0aa0..ce3e7c4f3 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_core_init(ModulesNumber, ModulesAutoload); + ModuleManager::LoadModuleList(ModulesNumber, ModulesAutoload); /* Initialize random number generator */ rand_init(); diff --git a/src/memoserv.c b/src/memoserv.c index 34e0061f9..901e002eb 100644 --- a/src/memoserv.c +++ b/src/memoserv.c @@ -25,7 +25,7 @@ E void rsend_notify(User *u, Memo *m, const char *chan); /*************************************************************************/ void moduleAddMemoServCmds(void) { - modules_core_init(MemoServCoreNumber, MemoServCoreModules); + ModuleManager::LoadModuleList(MemoServCoreNumber, MemoServCoreModules); } /*************************************************************************/ diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index 21ccd640d..1e5a8f8bb 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -11,3 +11,18 @@ #include "modules.h" #include "language.h" #include "version.h" + +void ModuleManager::LoadModuleList(int total_modules, char **module_list) +{ + int idx; + Module *m; + int status = 0; + for (idx = 0; idx < total_modules; idx++) { + m = findModule(module_list[idx]); + if (!m) { + status = loadModule(module_list[idx], NULL); + mod_current_module = NULL; + mod_current_user = NULL; + } + } +} diff --git a/src/modules.c b/src/modules.c index 88e788aa7..296700354 100644 --- a/src/modules.c +++ b/src/modules.c @@ -171,25 +171,6 @@ static int displayMessageFromHash(const char *name) /************************************************/ /** - * Load up a list of modules. - * @param number The number of modules to load - * @param list The list of modules to load - **/ -void modules_core_init(int number, char **list) -{ - int idx; - Module *m; - int status = 0; - for (idx = 0; idx < number; idx++) { - m = findModule(list[idx]); - if (!m) { - status = loadModule(list[idx], NULL); - mod_current_module = NULL; - mod_current_user = NULL; - } - } -} -/** * **/ int encryption_module_init(void) { diff --git a/src/nickserv.c b/src/nickserv.c index 2ee174c73..a127bc0c4 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -36,7 +36,7 @@ static void add_ns_timeout(NickAlias * na, int type, time_t delay); /*************************************************************************/ /* *INDENT-OFF* */ void moduleAddNickServCmds(void) { - modules_core_init(NickServCoreNumber, NickServCoreModules); + ModuleManager::LoadModuleList(NickServCoreNumber, NickServCoreModules); } /* *INDENT-ON* */ /*************************************************************************/ diff --git a/src/operserv.c b/src/operserv.c index 470a96008..a974b39dd 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -74,7 +74,7 @@ SListOpts szopts = { 0, NULL, &is_szline_entry_equal, &free_szline_entry }; /*************************************************************************/ /* *INDENT-OFF* */ void moduleAddOperServCmds(void) { - modules_core_init(OperServCoreNumber, OperServCoreModules); + ModuleManager::LoadModuleList(OperServCoreNumber, OperServCoreModules); } /* *INDENT-ON* */ |