delete operator tracking in debug mode (using a macro -- live with it.)

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index e785265ac89dba5089e35d0a084f8db5903fcff5..dea78c5268f74d4eb6c4e988ef985301786aee1d 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -71,27 +71,27 @@ class cmd_silence : public command_t
                                // does it contain any entries and does it exist?
                                if (sl)
                                {
-                                       if (sl->size())
-                                       {
-                                               for (silencelist::iterator i = sl->begin(); i != sl->end(); i++)
-                                               {
+                                       if (sl->size())
+                                       {
+                                               for (silencelist::iterator i = sl->begin(); i != sl->end(); i++)
+                                               {
                                                        // search through for the item
                                                        irc::string listitem = i->c_str();
                                                        irc::string target = nick;
                                                        if (listitem == target)
-                                                       {
-                                                               sl->erase(i);
+                                                       {
+                                                               sl->erase(i);
                                                                WriteServ(user->fd,"950 %s %s :Removed %s!*@* from silence list",user->nick, user->nick,nick);
                                                                // we have modified the vector from within a loop, we must now bail out
-                                                               return;
-                                                       }
-                                               }
-                                       }
+                                                               return;
+                                                       }
+                                               }
+                                       }
                                        if (!sl->size())
                                        {
                                                // tidy up -- if a user's list is empty, theres no use having it
                                                // hanging around in the user record.
-                                               delete sl;
+                                               DELETE(sl);
                                                user->Shrink("silence_list");
                                        }
                                }
@@ -146,14 +146,14 @@ class ModuleSilence : public Module
                List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
        }
 
-       virtual void OnUserQuit(userrec* user, std::string reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason)
        {
                // when the user quits tidy up any silence list they might have just to keep things tidy
                // and to prevent a HONKING BIG MEMORY LEAK!
                silencelist* sl = (silencelist*)user->GetExt("silence_list");
                if (sl)
                {
-                       delete sl;
+                       DELETE(sl);
                        user->Shrink("silence_list");
                }
        }
@@ -178,9 +178,9 @@ class ModuleSilence : public Module
                        {
                                for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
                                {
-                                        irc::string listitem = c->c_str();
-                                        irc::string target = user->nick;
-                                        if (listitem == target)
+                                       irc::string listitem = c->c_str();
+                                       irc::string target = user->nick;
+                                       if (listitem == target)
                                        {
                                                return 1;
                                        }
@@ -190,10 +190,10 @@ class ModuleSilence : public Module
                return 0;
        }
 
-        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
-        {
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+       {
                return OnUserPreNotice(user,dest,target_type,text,status);
-        }
+       }
 
        virtual ~ModuleSilence()
        {