From 4e7636c28e7b35df80555e9817b5415885604684 Mon Sep 17 00:00:00 2001
From: "Robin Burchell w00t@inspircd.org"
 <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Tue, 30 Sep 2008 22:38:19 +0000
Subject: Merge delbot() and cs_remove_bot() into BotInfo's destructor.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1281 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/core/bs_bot.c | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/core')

diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 3701bf662..54b51200c 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -16,7 +16,6 @@
 #include "module.h"
 
 int do_bot(User * u);
-int delbot(BotInfo * bi);
 void myBotServHelp(User * u);
 
 /**
@@ -327,7 +326,7 @@ int do_bot(User * u)
             if (ircd->sqline) {
                 anope_cmd_unsqline(bi->nick);
             }
-            delbot(bi);
+            delete bi;
 
             notice_lang(s_BotServ, u, BOT_BOT_DELETED, nick);
         }
@@ -337,28 +336,5 @@ int do_bot(User * u)
     return MOD_CONT;
 }
 
-int delbot(BotInfo * bi)
-{
-    cs_remove_bot(bi);
-
-    if (bi->next)
-        bi->next->prev = bi->prev;
-    if (bi->prev)
-        bi->prev->next = bi->next;
-    else
-        botlists[tolower(*bi->nick)] = bi->next;
-
-    nbots--;
-
-    free(bi->nick);
-    free(bi->user);
-    free(bi->host);
-    free(bi->real);
-
-    free(bi);
-
-    return 1;
-}
-
 
 MODULE_INIT("bs_bot")
-- 
cgit