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, 5 insertions, 7 deletions

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index e70270424..9b98ca83b 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -367,20 +367,18 @@ class CommandWatch : public Command
 
 class Modulewatch : public Module
 {
-	CommandWatch* mycommand;
-	CommandSVSWatch *sw;
 	unsigned int maxwatch;
+	CommandWatch cmdw;
+	CommandSVSWatch sw;
 
  public:
 	Modulewatch(InspIRCd* Me)
-		: Module(Me), maxwatch(32)
+		: Module(Me), maxwatch(32), cmdw(Me, maxwatch), sw(Me)
 	{
 		OnRehash(NULL);
 		whos_watching_me = new watchentries();
-		mycommand = new CommandWatch(ServerInstance, maxwatch);
-		ServerInstance->AddCommand(mycommand);
-		sw = new CommandSVSWatch(ServerInstance);
-		ServerInstance->AddCommand(sw);
+		ServerInstance->AddCommand(&cmdw);
+		ServerInstance->AddCommand(&sw);
 		Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnCleanup, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway };
 		ServerInstance->Modules->Attach(eventlist, this, 8);
 	}