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_censor.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/modules/m_censor.cpp') diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 0f1c3f61c..9c68be7fd 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -40,24 +40,18 @@ class CensorChannel : public SimpleChannelModeHandler class ModuleCensor : public Module { censor_t censors; - CensorUser *cu; - CensorChannel *cc; + CensorUser cu; + CensorChannel cc; public: ModuleCensor(InspIRCd* Me) - : Module(Me) + : Module(Me), cu(Me), cc(Me) { /* Read the configuration file on startup. */ OnRehash(NULL); - cu = new CensorUser(ServerInstance); - cc = new CensorChannel(ServerInstance); - if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc)) - { - delete cu; - delete cc; + if (!ServerInstance->Modes->AddMode(&cu) || !ServerInstance->Modes->AddMode(&cc)) throw ModuleException("Could not add new modes!"); - } Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRunTestSuite }; ServerInstance->Modules->Attach(eventlist, this, 4); } @@ -65,10 +59,8 @@ class ModuleCensor : public Module virtual ~ModuleCensor() { - ServerInstance->Modes->DelMode(cu); - ServerInstance->Modes->DelMode(cc); - delete cu; - delete cc; + ServerInstance->Modes->DelMode(&cu); + ServerInstance->Modes->DelMode(&cc); } // format of a config entry is -- cgit v1.2.3