Remove VF_SERVICEPROVIDER, prevent heap allocation of ConfigReader

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11904 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 8 insertions, 12 deletions

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 12c373ab8..8cc882d90 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -17,28 +17,24 @@
 
 class ModuleRestrictChans : public Module
 {
-
-
-	std::map<irc::string,int> allowchans;
+	std::set<irc::string> allowchans;
 
 	void ReadConfig()
 	{
-		ConfigReader* MyConf = new ConfigReader;
 		allowchans.clear();
-		for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
+		for (int i = 0;; i++)
 		{
-			std::string txt;
-			txt = MyConf->ReadValue("allowchannel", "name", i);
-			irc::string channel = txt.c_str();
-			allowchans[channel] = 1;
+			ConfigTag* tag = ServerInstance->Config->ConfValue("allowchannel", i);
+			if (!tag)
+				return;
+			std::string txt = tag->getString("name");
+			allowchans.insert(txt.c_str());
 		}
-		delete MyConf;
 	}
 
  public:
 	ModuleRestrictChans()
-			{
-
+	{
 		ReadConfig();
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 2);