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, 11 deletions

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 5e6501699..45b213b40 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -78,26 +78,21 @@ class Knock : public SimpleChannelModeHandler
 
 class ModuleKnock : public Module
 {
-	CommandKnock* mycommand;
-	Knock* kn;
+	CommandKnock cmd;
+	Knock kn;
  public:
-	ModuleKnock(InspIRCd* Me) : Module(Me)
+	ModuleKnock(InspIRCd* Me) : Module(Me), cmd(Me), kn(Me)
 	{
-		kn = new Knock(ServerInstance);
-
-		if (!ServerInstance->Modes->AddMode(kn))
+		if (!ServerInstance->Modes->AddMode(&kn))
 			throw ModuleException("Could not add new modes!");
-
-		mycommand = new CommandKnock(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 
 	}
 
 
 	virtual ~ModuleKnock()
 	{
-		ServerInstance->Modes->DelMode(kn);
-		delete kn;
+		ServerInstance->Modes->DelMode(&kn);
 	}
 
 	virtual Version GetVersion()