Remove some debug (im on a crusade to make debug mode useful, but at the same time...

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 945125c75d33b49068fd81578ff76f98bafafec7..ad1ec80853d3e30384b2f39ecf9947d7c51caf15 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -76,8 +76,16 @@ class cmd_svshold : public command_t
                                {
                                        if (parameters[0] == assign((*iter)->nickname))
                                        {
-                                               unsigned long remaining = ((*iter)->set_on + (*iter)->length) - ServerInstance->Time();
-                                               user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick, (*iter)->nickname.c_str(), remaining, (*iter)->reason.c_str());
+                                               unsigned long remaining = 0;
+                                               if ((*iter)->length)
+                                               {
+                                                       remaining = ((*iter)->set_on + (*iter)->length) - ServerInstance->Time();
+                                                       user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick, (*iter)->nickname.c_str(), remaining, (*iter)->reason.c_str());
+                                               }
+                                               else
+                                               {
+                                                       user->WriteServ( "386 %s %s :Removed permenant SVSHOLD (%s)", user->nick, (*iter)->nickname.c_str(), (*iter)->reason.c_str());
+                                               }
                                                SVSHolds.erase(iter);
                                                break;
                                        }
@@ -119,7 +127,7 @@ class cmd_svshold : public command_t
                                }
                                else
                                {
-                                       user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str());
+                                       user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], parameters[0], reason.c_str());
                                        ServerInstance->WriteOpers("*** %s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str());
                                }
                        }
@@ -242,33 +250,22 @@ class ModuleSVSHold : public Module
 
        void ExpireBans()
        {
-               bool go_again = true;
-
-               while (go_again)
+               SVSHoldlist::iterator iter,safeiter;
+               for (iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++)
                {
-                       go_again = false;
-       
-                       for (SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++)
+                       /* 0 == permanent, don't mess with them! -- w00t */
+                       if ((*iter)->length != 0)
                        {
-                               /* 0 == permanent, don't mess with them! -- w00t */
-                               if ((*iter)->length != 0)
+                               if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
                                {
-                                       if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
-                                       {
-                                               ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
-                                               ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
-                                               HoldMap.erase(assign((*iter)->nickname));
-
-                                               delete *iter;
-
-                                               SVSHolds.erase(iter);
-
-                                               go_again = true;
-                                       }
+                                       ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
+                                       ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
+                                       HoldMap.erase(assign((*iter)->nickname));
+                                       delete *iter;
+                                       safeiter = iter;
+                                       --iter;
+                                       SVSHolds.erase(safeiter);
                                }
-       
-                               if (go_again == true)
-                                       break;
                        }
                }
        }