Valgrind cleanup: Add RemoveRFCCommands() to dlclose() and delete the core commands

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

2 files changed, 14 insertions, 1 deletions

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index b063e392c..3f8f63c48 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -425,6 +425,19 @@ void CommandParser::RemoveCommands(const char* source)
 	}
 }
 
+void CommandParser::RemoveRFCCommands()
+{
+	for(SharedObjectList::iterator c = RFCCommands.begin(); c != RFCCommands.end(); c++)
+	{
+		std::string cmd = c->first;
+		Command* cmdptr = cmdlist.find(cmd)->second;
+		cmdlist.erase(cmdlist.find(cmd));
+		delete cmdptr;
+		dlclose(c->second);
+	}
+	RFCCommands.clear();
+}
+
 void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
 {
 	Command* x = safei->second;
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index d7239e0b4..28aa0e1b9 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -127,7 +127,7 @@ void InspIRCd::Cleanup()
 		}
 	}
 	/* Remove core commands */
-	Parser->RemoveCommands("<core>");
+	Parser->RemoveRFCCommands();
 
 	/* Cleanup Server Names */
 	for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)