summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/bs_badwords.c4
-rw-r--r--src/core/cs_akick.c5
-rw-r--r--src/ircd.c6
3 files changed, 10 insertions, 5 deletions
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 3a0828db4..acdc9ad4b 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -279,9 +279,11 @@ int badwords_del_callback(User * u, int num, va_list args)
BadWord *bw;
ChannelInfo *ci = va_arg(args, ChannelInfo *);
int *last = va_arg(args, int *);
+
+ *last = num;
+
if (num < 1 || num > ci->bwcount)
return 0;
- *last = num;
bw = &ci->badwords[num - 1];
if (bw->word)
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 773388b8a..4108f58e3 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -94,9 +94,12 @@ int akick_del_callback(User * u, int num, va_list args)
{
ChannelInfo *ci = va_arg(args, ChannelInfo *);
int *last = va_arg(args, int *);
+
+ *last = num;
+
if (num < 1 || num > ci->akickcount)
return 0;
- *last = num;
+
return akick_del(u, &ci->akick[num - 1]);
}
diff --git a/src/ircd.c b/src/ircd.c
index b64c073cf..b56566de1 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -1012,9 +1012,9 @@ void pmodule_cmd_ctcp(void (*func) (char *source, char *dest, char *buf))
ircdproto.ircd_cmd_ctcp = func;
}
-void
-pmodule_cmd_svsjoin(void (*func)
- (char *source, char *nick, char *chan, char *param))
+void pmodule_cmd_svsjoin(void (*func)
+ (char *source, char *nick, char *chan,
+ char *param))
{
ircdproto.ircd_cmd_svsjoin = func;
}