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_helpop.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 0f65d7dfa..4800ebac8 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -114,21 +114,19 @@ class ModuleHelpop : public Module
 {
 	private:
 		std::string  h_file;
-		CommandHelpop* mycommand;
-		Helpop* ho;
+		CommandHelpop cmd;
+		Helpop ho;
 
 	public:
 		ModuleHelpop(InspIRCd* Me)
-			: Module(Me)
+			: Module(Me), cmd(Me), ho(Me)
 		{
 			ReadConfig();
-			ho = new Helpop(ServerInstance);
-			if (!ServerInstance->Modes->AddMode(ho))
+			if (!ServerInstance->Modes->AddMode(&ho))
 				throw ModuleException("Could not add new modes!");
-			mycommand = new CommandHelpop(ServerInstance);
-			ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+			ServerInstance->AddCommand(&cmd);
+			Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+			ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual void ReadConfig()
@@ -179,8 +177,7 @@ class ModuleHelpop : public Module
 
 		virtual ~ModuleHelpop()
 		{
-			ServerInstance->Modes->DelMode(ho);
-			delete ho;
+			ServerInstance->Modes->DelMode(&ho);
 		}
 
 		virtual Version GetVersion()
-- 
cgit v1.3.1-10-gc9f91