diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-16 20:26:24 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-04-16 20:26:24 +0000 |
| commit | 89850c85a932285d7698703e16dfc8c2e4096dee (patch) | |
| tree | 88c7bf7a856b9b6b32dca746436bc29a30ebb48d /src | |
| parent | d8e1f104a4042ef985a7f6c6a2994e6fb931925c (diff) | |
Remove unused modules_unload_all fini param
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2279 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/modules.c | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/main.c b/src/main.c index 35b1361bc..64b737e8b 100644 --- a/src/main.c +++ b/src/main.c @@ -167,8 +167,8 @@ static void services_restart() disconn(servsock); close_log(); /* First don't unload protocol module, then do so */ - modules_unload_all(true, false); - modules_unload_all(true, true); + modules_unload_all(false); + modules_unload_all(true); chdir(binary_dir.c_str()); execve(SERVICES_BIN, my_av, my_envp); if (!readonly) { @@ -223,8 +223,8 @@ static void services_shutdown() send_event(EVENT_SHUTDOWN, 1, EVENT_STOP); disconn(servsock); /* First don't unload protocol module, then do so */ - modules_unload_all(true, false); - modules_unload_all(true, true); + modules_unload_all(false); + modules_unload_all(true); /* just in case they weren't all removed at least run once */ ModuleRunTimeDirCleanUp(); } diff --git a/src/modules.c b/src/modules.c index da7d6a9ed..c2d20edaf 100644 --- a/src/modules.c +++ b/src/modules.c @@ -112,20 +112,11 @@ int protocol_module_init() * And if that isn't enough discouragement, you'll wake up with your * both legs broken tomorrow ;) -GD */ -void modules_unload_all(bool fini, bool unload_proto) +void modules_unload_all(bool unload_proto) { int idx; ModuleHash *mh, *next; - if (!fini) - { - /* - * XXX: This was used to stop modules from executing destructors, we don't really - * support this now, so just return.. dirty. We need to rewrite the code that uses this param. - */ - return; - } - for (idx = 0; idx < MAX_CMD_HASH; idx++) { mh = MODULE_HASH[idx]; while (mh) { |