diff options
| author | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-09-30 18:45:09 +0000 |
|---|---|---|
| committer | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-09-30 18:45:09 +0000 |
| commit | 06f53a85821be6c7d276e2ee5721163d469af784 (patch) | |
| tree | 4b0ab9c092d2a4d90f6a74d2e4ca9dfb0620d826 /src/botserv.c | |
| parent | aa806eba53a7ccc715839bd972c9b158f39b6225 (diff) | |
Various constification/fixes for g++.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1183 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/botserv.c')
| -rw-r--r-- | src/botserv.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/botserv.c b/src/botserv.c index 5c23766ef..682bb33a6 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -886,7 +886,7 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...) va_list args; char buf[1024]; const char *fmt; - char *av[3]; + const char *av[3]; if (!ci || !ci->bi || !ci->c || !u) return; @@ -915,6 +915,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, { int ac; char *av[4]; + const char *kav[4]; // seperate as not everything is constified XXX -- w00t char mask[BUFSIZE]; char buf[BUFSIZE]; User *u = finduser(nick); @@ -967,28 +968,28 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, else free(av[1]); - av[0] = ci->name; - av[1] = nick; + kav[0] = ci->name; + kav[1] = nick; if (!reason) { - av[2] = ci->bi->nick; + kav[2] = ci->bi->nick; } else { if (strlen(reason) > 200) reason[200] = '\0'; - av[2] = reason; + kav[2] = reason; } /* Check if we need to do a signkick or not -GD */ if ((ci->flags & CI_SIGNKICK) || ((ci->flags & CI_SIGNKICK_LEVEL) && !check_access(requester, ci, CA_SIGNKICK))) - anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2], + anope_cmd_kick(ci->bi->nick, kav[0], kav[1], "%s (%s)", kav[2], requester->nick); else - anope_cmd_kick(ci->bi->nick, av[0], av[1], "%s", av[2]); + anope_cmd_kick(ci->bi->nick, kav[0], kav[1], "%s", kav[2]); - do_kick(ci->bi->nick, 3, av); - send_event(EVENT_BOT_KICK, 3, av[1], av[0], av[2]); + do_kick(ci->bi->nick, 3, kav); + send_event(EVENT_BOT_KICK, 3, kav[1], kav[0], kav[2]); } /*************************************************************************/ @@ -998,7 +999,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick, void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick, char *reason) { - char *av[3]; + const char *av[3]; User *u = finduser(nick); if (!u || !is_on_chan(ci->c, u)) |