X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FChanNode.c;h=44a335f1cb822f2d7c414ebeef955781c93601c1;hp=fddde4c10598cbd2d01e0762e0e4467af20619c0;hb=HEAD;hpb=689da1db7e2517c187ce76c6c553e20d630a7f36 diff --git a/src/ChanNode.c b/src/ChanNode.c index fddde4c..44a335f 100644 --- a/src/ChanNode.c +++ b/src/ChanNode.c @@ -1,4 +1,4 @@ -/* ChanNode.c - NeonServ v5.4 +/* ChanNode.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -21,6 +21,8 @@ #include "modcmd.h" #include "ModeNode.h" #include "IRCEvents.h" +#include "tools.h" +#include "log.h" static struct ChanNode **chanList; @@ -130,7 +132,7 @@ struct ChanNode* addChannel(const char *name) { struct ChanNode *chan = malloc(sizeof(*chan)); if (!chan) { - perror("malloc() failed"); + printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return NULL; } strcpy(chan->name, name); @@ -138,7 +140,7 @@ struct ChanNode* addChannel(const char *name) { chan->bans = NULL; chan->spam_settings = NULL; chan->usercount = 0; - chan->chanbot = NULL; + chan->botcount = 0; chan->topic[0] = 0; chan->flags = 0; /* mode lists */ @@ -236,10 +238,8 @@ void freeChanNode(struct ChanNode* chan) { int checkChannelVisibility(struct ChanNode* chan) { struct ChanUser *chanuser, *next; for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) { - if(chanuser->user->flags & USERFLAG_ISBOT) { - chan->chanbot = chanuser->user; + if(chanuser->user->flags & USERFLAG_ISBOT) return 1; - } } //free the channel... SYNCHRONIZE(cache_sync);