X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_kick.c;h=a4d3481e713e242d0b808c9451aad83c2acb6851;hb=b3c0421db9c607c841b8926725dfab5323872a87;hp=7ffcf659d82b0b5ceecbd789d7269940a595824f;hpb=706e48b1e666054030c491d864f740071e390038;p=NeonServV5.git diff --git a/src/modules/NeonServ.mod/cmd_neonserv_kick.c b/src/modules/NeonServ.mod/cmd_neonserv_kick.c index 7ffcf65..a4d3481 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_kick.c +++ b/src/modules/NeonServ.mod/cmd_neonserv_kick.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_kick.c - NeonServ v5.3 +/* cmd_neonserv_kick.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -35,11 +35,11 @@ struct neonserv_cmd_kick_cache { CMD_BIND(neonserv_cmd_kick) { struct neonserv_cmd_kick_cache *cache = malloc(sizeof(*cache)); if (!cache) { - perror("malloc() failed"); + printf_log("neonserv", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return; } cache->client = client; - cache->textclient = getTextBot(); + cache->textclient = textclient; cache->user = user; cache->event = event; cache->nicks = strdup(argv[0]); @@ -47,7 +47,7 @@ CMD_BIND(neonserv_cmd_kick) { cache->reason = strdup(merge_argv(argv, 1, argc)); } else cache->reason = NULL; - get_userlist_with_invisible(chan, neonserv_cmd_kick_userlist_lookup, cache); + get_userlist_with_invisible(chan, module_id, neonserv_cmd_kick_userlist_lookup, cache); } static USERLIST_CALLBACK(neonserv_cmd_kick_userlist_lookup) { @@ -159,9 +159,9 @@ static void neonserv_cmd_kick_async1(struct ClientSocket *client, struct ClientS } } if(kicked_users == provided_nicks) - reply(getTextBot(), user, "NS_KICK_DONE", kicked_users, chan->name); + reply(textclient, user, "NS_KICK_DONE", kicked_users, chan->name); else - reply(getTextBot(), user, "NS_KICK_FAIL", client->user->nick); + reply(textclient, user, "NS_KICK_FAIL", client->user->nick); if(kicked_users) logEvent(event); }