ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate mode unregistering code in ModuleManager::DoSafeUnload() and extract into a method

Browse Source
This commit is contained in:
Attila Molnar 2016-08-29 14:33:25 +02:00
parent f9455b925d
commit 6c4a6b1753
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/modules.h
View File

@ -1037,6 +1037,12 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
*/
bool PrioritizeHooks();
/** Unregister all user modes or all channel modes owned by a module
* @param mod Module whose modes to unregister
* @param modetype MODETYPE_USER to unregister user modes, MODETYPE_CHANNEL to unregister channel modes
*/
void UnregisterModes(Module* mod, ModeType modetype);
public:
typedef std::map<std::string, Module*> ModuleMap;

31
src/modules.cpp
View File

@ -342,6 +342,18 @@ bool ModuleManager::CanUnload(Module* mod)
return true;
}
void ModuleManager::UnregisterModes(Module* mod, ModeType modetype)
{
const ModeParser::ModeHandlerMap& modes = ServerInstance->Modes.GetModes(modetype);
for (ModeParser::ModeHandlerMap::const_iterator i = modes.begin(); i != modes.end(); )
{
ModeHandler* const mh = i->second;
++i;
if (mh->creator == mod)
this->DelService(*mh);
}
}
void ModuleManager::DoSafeUnload(Module* mod)
{
// First, notify all modules that a module is about to be unloaded, so in case
@ -376,23 +388,8 @@ void ModuleManager::DoSafeUnload(Module* mod)
user->doUnhookExtensions(items);
}
const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); )
{
ModeHandler* mh = i->second;
++i;
if (mh->creator == mod)
this->DelService(*mh);
}
const ModeParser::ModeHandlerMap& chanmodes = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); )
{
ModeHandler* mh = i->second;
++i;
if (mh->creator == mod)
this->DelService(*mh);
}
UnregisterModes(mod, MODETYPE_USER);
UnregisterModes(mod, MODETYPE_CHANNEL);
for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
{