Fix memory leak and invalid vtable location on unload of m_sslinfo

[user/henk/code/inspircd.git] / src / modules / m_deaf.cpp

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 7a810ae3174ac72b2df7c134cec050206b73569d..aaa3696b5fc52b0887e2c31b972d638c2c9bdc04 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -20,9 +20,9 @@
 class User_d : public ModeHandler
 {
  public:
-       User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
+       User_d(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -54,7 +54,7 @@ class ModuleDeaf : public Module
 
  public:
        ModuleDeaf(InspIRCd* Me)
-               : Module(Me), m1(Me)
+               : Module(Me), m1(Me, this)
        {
                if (!ServerInstance->Modes->AddMode(&m1))
                        throw ModuleException("Could not add new modes!");
@@ -74,7 +74,7 @@ class ModuleDeaf : public Module
                delete conf;
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -83,10 +83,10 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -95,7 +95,7 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)