From a39bd397cd0052dd8e23ba5c4c5dfc9b3a11a70c Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Mon, 23 Nov 2015 12:46:59 +0100
Subject: Extract code that manipulates the ModuleManager::DataProviders map
 into methods

---
 src/modules.cpp | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/modules.cpp b/src/modules.cpp
index 9e653a4ab..0223d12f1 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -564,8 +564,7 @@ void ModuleManager::AddService(ServiceProvider& item)
 		{
 			ModeHandler* mh = static_cast<ModeHandler*>(&item);
 			ServerInstance->Modes->AddMode(mh);
-			DataProviders.insert(std::make_pair((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item));
-			dynamic_reference_base::reset_all();
+			AddReferent((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item);
 			return;
 		}
 		case SERVICE_METADATA:
@@ -604,13 +603,7 @@ void ModuleManager::DelService(ServiceProvider& item)
 		case SERVICE_DATA:
 		case SERVICE_IOHOOK:
 		{
-			for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
-			{
-				std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
-				if (curr->second == &item)
-					DataProviders.erase(curr);
-			}
-			dynamic_reference_base::reset_all();
+			DelReferent(&item);
 			return;
 		}
 		default:
@@ -702,3 +695,22 @@ Module* ModuleManager::Find(const std::string &name)
 	else
 		return modfind->second;
 }
+
+void ModuleManager::AddReferent(const std::string& name, ServiceProvider* service)
+{
+	DataProviders.insert(std::make_pair(name, service));
+	dynamic_reference_base::reset_all();
+}
+
+void ModuleManager::DelReferent(ServiceProvider* service)
+{
+	for (std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+	{
+		ServiceProvider* curr = i->second;
+		if (curr == service)
+			DataProviders.erase(i++);
+		else
+			++i;
+	}
+	dynamic_reference_base::reset_all();
+}
-- 
cgit v1.2.3