From 2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f Mon Sep 17 00:00:00 2001
From: danieldg
Date: Wed, 2 Sep 2009 00:43:04 +0000
Subject: 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
---
 src/modules/m_kicknorejoin.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_kicknorejoin.cpp')

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 9e12b4e18..678321033 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -112,16 +112,14 @@ class KickRejoin : public ModeHandler
 class ModuleKickNoRejoin : public Module
 {
 
-	KickRejoin* kr;
+	KickRejoin kr;
 
 public:
 
 	ModuleKickNoRejoin(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), kr(Me)
 	{
-
-		kr = new KickRejoin(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(kr))
+		if (!ServerInstance->Modes->AddMode(&kr))
 			throw ModuleException("Could not add new modes!");
 		Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -201,8 +199,7 @@ public:
 
 	virtual ~ModuleKickNoRejoin()
 	{
-		ServerInstance->Modes->DelMode(kr);
-		delete kr;
+		ServerInstance->Modes->DelMode(&kr);
 	}
 
 	virtual Version GetVersion()
-- 
cgit v1.3.1-10-gc9f91