Fix MySQL crash on module unload with empty query queue

[user/henk/code/inspircd.git] / src / modes / cmode_b.cpp

diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index d9ecb5b07a7ad548137b5abd17aa4fb08a7f16a6..5fcebfde961ff2c43043c40a78c1e1322bea7018 100644 (file)
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@
 #include "hashcomp.h"
 #include "modes/cmode_b.h"
 
-ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(NULL, 'b', PARAM_ALWAYS, MODETYPE_CHANNEL)
+ModeChannelBan::ModeChannelBan() : ModeHandler(NULL, "ban", 'b', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
        list = true;
 }
@@ -117,7 +117,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        }
 
        ModResult MOD_RESULT;
-       FIRST_MOD_RESULT(ServerInstance, OnAddBan, MOD_RESULT, (user,chan,dest));
+       FIRST_MOD_RESULT(OnAddBan, MOD_RESULT, (user,chan,dest));
        if (MOD_RESULT == MOD_RES_DENY)
        {
                dest = "";
@@ -141,18 +141,6 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
        return dest;
 }
 
-ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-{
-       for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
-       {
-               if (!strcasecmp(i->data.c_str(), parameter.c_str()))
-               {
-                       return std::make_pair(true, i->data);
-               }
-       }
-       return std::make_pair(false, parameter);
-}
-
 std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int)
 {
        if ((!user) || (!chan))
@@ -170,7 +158,7 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
                if (!strcasecmp(i->data.c_str(), dest.c_str()))
                {
                        ModResult MOD_RESULT;
-                       FIRST_MOD_RESULT(ServerInstance, OnDelBan, MOD_RESULT, (user, chan, dest));
+                       FIRST_MOD_RESULT(OnDelBan, MOD_RESULT, (user, chan, dest));
                        if (MOD_RESULT == MOD_RES_DENY)
                        {
                                dest = "";