summaryrefslogtreecommitdiff
path: root/src/botserv.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/botserv.c')
-rw-r--r--src/botserv.c31
1 files changed, 11 insertions, 20 deletions
diff --git a/src/botserv.c b/src/botserv.c
index 745acb47c..ea31d70f7 100644
--- a/src/botserv.c
+++ b/src/botserv.c
@@ -589,30 +589,21 @@ void insert_bot(BotInfo * bi)
BotInfo *findbot(const char *nick)
{
- BotInfo *bi;
- Uid *ud;
+ BotInfo *bi;
- /* to keep make strict happy */
- ud = NULL;
+ if (!nick || !*nick)
+ return NULL;
- if (!nick || !*nick)
- return NULL;
+ for (bi = botlists[tolower(*nick)]; bi; bi = bi->next)
+ {
+ if (!stricmp(nick, bi->nick))
+ return bi;
- for (bi = botlists[tolower(*nick)]; bi; bi = bi->next) {
- if (UseTS6 && ircd->ts6) {
- ud = find_nickuid(nick);
- }
- if (!stricmp(nick, bi->nick)) {
- return bi;
- }
- if (ud && UseTS6 && ircd->ts6) {
- if (!stricmp(ud->nick, bi->nick)) {
- return bi;
- }
- }
- }
+ if (nick == bi->uid)
+ return bi;
+ }
- return NULL;
+ return NULL;
}
/*************************************************************************/