Change allocation of commands/modes

API change: Commands passed to AddCommand are no longer deleted automatically

This removes lots of needless heap allocation and fixes a few memory leaks by
allocating commands and modes as part of the Module rather than creating them
separately in the module constructor.

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

1 files changed, 6 insertions, 9 deletions

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 939807bd3..f4532ecd1 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -174,20 +174,17 @@ class CommandShun : public Command
 
 class ModuleShun : public Module
 {
-	CommandShun* mycommand;
-	ShunFactory *f;
+	CommandShun cmd;
+	ShunFactory f;
 	std::set<std::string> ShunEnabledCommands;
 	bool NotifyOfShun;
 	bool affectopers;
 
  public:
-	ModuleShun(InspIRCd* Me) : Module(Me)
+	ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me), f(Me)
 	{
-		f = new ShunFactory(ServerInstance);
-		ServerInstance->XLines->RegisterFactory(f);
-
-		mycommand = new CommandShun(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->XLines->RegisterFactory(&f);
+		ServerInstance->AddCommand(&cmd);
 
 		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -197,7 +194,7 @@ class ModuleShun : public Module
 	virtual ~ModuleShun()
 	{
 		ServerInstance->XLines->DelAll("SHUN");
-		ServerInstance->XLines->UnregisterFactory(f);
+		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list& out)