pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-07 14:23:13 +02:00
Code Activity

Various constification/fixes for g++.

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1183 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-09-30 18:45:09 +00:00
parent aa806eba53
commit 06f53a8582
8 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/extern.h
+1 -1
View File
@@ -132,7 +132,7 @@ E const char *get_xop_level(int level);
E void do_cmode(const char *source, int ac, char **av);
E void do_join(const char *source, int ac, char **av);
E void do_kick(const char *source, int ac, char **av);
E void do_kick(const char *source, int ac, const char **av);
E void do_part(const char *source, int ac, char **av);
E void do_sjoin(const char *source, int ac, char **av);
E void do_topic(const char *source, int ac, char **av);
src/actions.c
+1 -1
View File
@@ -84,7 +84,7 @@ void sqline(char *mask, char *reason)
{
int i;
Channel *c, *next;
char *av[3];
const char *av[3];
struct c_userlist *cu, *cunext;
if (ircd->chansqline) {
src/botserv.c
+11 -10
View File
@@ -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))
src/channels.c
+2 -2
View File
@@ -596,7 +596,7 @@ void do_join(const char *source, int ac, char **av)
* av[2] = reason
*/
void do_kick(const char *source, int ac, char **av)
void do_kick(const char *source, int ac, const char **av)
{
BotInfo *bi;
ChannelInfo *ci;
@@ -604,7 +604,7 @@ void do_kick(const char *source, int ac, char **av)
char *s, *t;
struct u_chanlist *c;
t = av[1];
t = (char *)av[1]; // XXX unsafe cast, this needs reviewing -- w00t
while (*(s = t)) {
t = s + strcspn(s, ",");
if (*t)
src/core/bs_badwords.c
+2 -2
View File
@@ -132,7 +132,7 @@ int do_badwords(User * u)
if (i < BSBadWordsMax) {
ci->bwcount++;
ci->badwords =
srealloc(ci->badwords, sizeof(BadWord) * ci->bwcount);
(BadWord *)srealloc(ci->badwords, sizeof(BadWord) * ci->bwcount);
} else {
notice_lang(s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT,
BSBadWordsMax);
@@ -225,7 +225,7 @@ int do_badwords(User * u)
ci->bwcount--;
}
ci->badwords =
srealloc(ci->badwords,sizeof(BadWord) * ci->bwcount);
(BadWord *)srealloc(ci->badwords,sizeof(BadWord) * ci->bwcount);
}
} else if (stricmp(cmd, "LIST") == 0) {
src/core/cs_access.c
+2 -2
View File
@@ -247,7 +247,7 @@ int do_access(User * u)
if (i < CSAccessMax) {
ci->accesscount++;
ci->access =
srealloc(ci->access,
(ChanAccess *)srealloc(ci->access,
sizeof(ChanAccess) * ci->accesscount);
} else {
notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT,
@@ -361,7 +361,7 @@ int do_access(User * u)
ci->accesscount--;
}
ci->access =
srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
(ChanAccess *)srealloc(ci->access,sizeof(ChanAccess) * ci->accesscount);
/* We don't know the nick if someone used numbers, so we trigger the event without
* nick param. We just do this once, even if someone enters a range. -Certus */
src/core/cs_akick.c
+3 -3
View File
@@ -220,7 +220,7 @@ int do_akick(User * u)
if (!na) {
split_usermask(mask, &nick, &user, &host);
mask =
scalloc(strlen(nick) + strlen(user) + strlen(host) + 3, 1);
(char *)scalloc(strlen(nick) + strlen(user) + strlen(host) + 3, 1);
freemask = 1;
sprintf(mask, "%s!%s@%s", nick, user, host);
free(nick);
@@ -313,7 +313,7 @@ int do_akick(User * u)
}
ci->akickcount++;
ci->akick =
srealloc(ci->akick, sizeof(AutoKick) * ci->akickcount);
(AutoKick *)srealloc(ci->akick, sizeof(AutoKick) * ci->akickcount);
akick = &ci->akick[i];
akick->flags = AK_USED;
if (nc) {
@@ -532,7 +532,7 @@ int do_akick(User * u)
ci->akickcount--;
}
ci->akick =
srealloc(ci->akick,sizeof(AutoKick) * ci->akickcount);
(AutoKick *)srealloc(ci->akick,sizeof(AutoKick) * ci->akickcount);
}
} else if (stricmp(cmd, "LIST") == 0) {
int sent_header = 0;
src/core/cs_forbid.c
+1 -1
View File
@@ -101,7 +101,7 @@ int do_forbid(User * u)
if ((c = findchan(ci->name))) {
struct c_userlist *cu, *next;
char *av[3];
const char *av[3];
for (cu = c->users; cu; cu = next) {
next = cu->next;