summaryrefslogtreecommitdiff
path: root/src/irc/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/irc/core')
-rw-r--r--src/irc/core/channel-events.c22
-rw-r--r--src/irc/core/channel-rejoin.c2
-rw-r--r--src/irc/core/channels-query.c15
-rw-r--r--src/irc/core/ctcp.c27
-rw-r--r--src/irc/core/irc-commands.c12
-rw-r--r--src/irc/core/irc-expandos.c6
-rw-r--r--src/irc/core/irc-log.c4
-rw-r--r--src/irc/core/irc-nicklist.c24
-rw-r--r--src/irc/core/irc-queries.c4
-rw-r--r--src/irc/core/irc-servers-reconnect.c2
-rw-r--r--src/irc/core/irc-servers.c10
-rw-r--r--src/irc/core/irc.c4
-rw-r--r--src/irc/core/lag.c4
-rw-r--r--src/irc/core/massjoin.c8
-rw-r--r--src/irc/core/mode-lists.c6
-rw-r--r--src/irc/core/modes.c8
-rw-r--r--src/irc/core/netsplit.c6
17 files changed, 84 insertions, 80 deletions
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 9714b38e..e6c1839c 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -25,7 +25,7 @@
#include "irc.h"
#include "irc-channels.h"
-static void event_cannot_join(const char *data, IRC_SERVER_REC *server)
+static void event_cannot_join(IRC_SERVER_REC *server, const char *data)
{
CHANNEL_REC *chanrec;
char *params, *channel;
@@ -54,7 +54,7 @@ static void event_cannot_join(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_duplicate_channel(const char *data, IRC_SERVER_REC *server)
+static void event_duplicate_channel(IRC_SERVER_REC *server, const char *data)
{
CHANNEL_REC *chanrec;
char *params, *channel, *p;
@@ -78,7 +78,7 @@ static void event_duplicate_channel(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_target_unavailable(const char *data, IRC_SERVER_REC *server)
+static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
@@ -87,7 +87,7 @@ static void event_target_unavailable(const char *data, IRC_SERVER_REC *server)
params = event_get_params(data, 2, NULL, &channel);
if (ischannel(*channel)) {
/* channel is unavailable - try to join again a bit later */
- event_cannot_join(data, server);
+ event_cannot_join(server, data);
}
g_free(params);
@@ -115,7 +115,7 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
signal_emit("channel topic changed", 1, chanrec);
}
-static void event_topic_get(const char *data, IRC_SERVER_REC *server)
+static void event_topic_get(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel, *topic;
@@ -126,7 +126,7 @@ static void event_topic_get(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_topic(const char *data, IRC_SERVER_REC *server,
+static void event_topic(IRC_SERVER_REC *server, const char *data,
const char *nick)
{
char *params, *channel, *topic;
@@ -138,7 +138,7 @@ static void event_topic(const char *data, IRC_SERVER_REC *server,
g_free(params);
}
-static void event_topic_info(const char *data, IRC_SERVER_REC *server)
+static void event_topic_info(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel, *topicby, *topictime;
time_t t;
@@ -176,7 +176,7 @@ static IRC_CHANNEL_REC *channel_find_unjoined(IRC_SERVER_REC *server,
return NULL;
}
-static void event_join(const char *data, IRC_SERVER_REC *server, const char *nick, const char *address)
+static void event_join(IRC_SERVER_REC *server, const char *data, const char *nick, const char *address)
{
char *params, *channel, *tmp;
IRC_CHANNEL_REC *chanrec;
@@ -233,7 +233,7 @@ static void event_join(const char *data, IRC_SERVER_REC *server, const char *nic
g_free(params);
}
-static void event_part(const char *data, IRC_SERVER_REC *server, const char *nick)
+static void event_part(IRC_SERVER_REC *server, const char *data, const char *nick)
{
char *params, *channel, *reason;
CHANNEL_REC *chanrec;
@@ -256,7 +256,7 @@ static void event_part(const char *data, IRC_SERVER_REC *server, const char *nic
g_free(params);
}
-static void event_kick(const char *data, IRC_SERVER_REC *server)
+static void event_kick(IRC_SERVER_REC *server, const char *data)
{
CHANNEL_REC *chanrec;
char *params, *channel, *nick, *reason;
@@ -280,7 +280,7 @@ static void event_kick(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_invite(const char *data, IRC_SERVER_REC *server)
+static void event_invite(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c
index 4114c065..0b7fb955 100644
--- a/src/irc/core/channel-rejoin.c
+++ b/src/irc/core/channel-rejoin.c
@@ -102,7 +102,7 @@ static void channel_rejoin(IRC_SERVER_REC *server, const char *channel)
channel_destroy(CHANNEL(chanrec));
}
-static void event_target_unavailable(const char *data, IRC_SERVER_REC *server)
+static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
IRC_CHANNEL_REC *chanrec;
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c
index 2283fdad..b338a0eb 100644
--- a/src/irc/core/channels-query.c
+++ b/src/irc/core/channels-query.c
@@ -396,7 +396,8 @@ static void channel_got_query(IRC_SERVER_REC *server, IRC_CHANNEL_REC *chanrec,
channels_query_check(server);
}
-static void event_channel_mode(char *data, IRC_SERVER_REC *server, const char *nick)
+static void event_channel_mode(IRC_SERVER_REC *server, const char *data,
+ const char *nick)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel, *mode;
@@ -420,7 +421,7 @@ static void multi_query_remove(IRC_SERVER_REC *server, const char *event, const
server_redirect_remove_next((SERVER_REC *) server, event, queue);
}
-static void event_end_of_who(const char *data, IRC_SERVER_REC *server)
+static void event_end_of_who(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
NICK_REC *nick;
@@ -474,7 +475,7 @@ static void event_end_of_who(const char *data, IRC_SERVER_REC *server)
}
}
-static void event_end_of_banlist(const char *data, IRC_SERVER_REC *server)
+static void event_end_of_banlist(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel;
@@ -489,7 +490,7 @@ static void event_end_of_banlist(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_end_of_ebanlist(const char *data, IRC_SERVER_REC *server)
+static void event_end_of_ebanlist(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel;
@@ -504,7 +505,7 @@ static void event_end_of_ebanlist(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_end_of_invitelist(const char *data, IRC_SERVER_REC *server)
+static void event_end_of_invitelist(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel;
@@ -557,7 +558,7 @@ static void multi_command_error(IRC_SERVER_REC *server, const char *data,
channels_query_check(server);
}
-static void event_mode_abort(const char *data, IRC_SERVER_REC *server)
+static void event_mode_abort(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
@@ -576,7 +577,7 @@ static void event_mode_abort(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_who_abort(const char *data, IRC_SERVER_REC *server)
+static void event_who_abort(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c
index 3072e2f4..3eb140f7 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -63,7 +63,7 @@ void ctcp_send_reply(IRC_SERVER_REC *server, const char *data)
}
/* CTCP ping */
-static void ctcp_ping(const char *data, IRC_SERVER_REC *server,
+static void ctcp_ping(IRC_SERVER_REC *server, const char *data,
const char *nick)
{
char *str;
@@ -78,7 +78,7 @@ static void ctcp_ping(const char *data, IRC_SERVER_REC *server,
}
/* CTCP version */
-static void ctcp_version(const char *data, IRC_SERVER_REC *server,
+static void ctcp_version(IRC_SERVER_REC *server, const char *data,
const char *nick)
{
char *str, *reply;
@@ -95,7 +95,8 @@ static void ctcp_version(const char *data, IRC_SERVER_REC *server,
}
/* CTCP version */
-static void ctcp_time(const char *data, IRC_SERVER_REC *server, const char *nick)
+static void ctcp_time(IRC_SERVER_REC *server, const char *data,
+ const char *nick)
{
char *str, *reply;
struct tm *tm;
@@ -115,7 +116,7 @@ static void ctcp_time(const char *data, IRC_SERVER_REC *server, const char *nick
g_free(reply);
}
-static void ctcp_msg(const char *data, IRC_SERVER_REC *server,
+static void ctcp_msg(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr, const char *target)
{
char *args, *str;
@@ -128,14 +129,14 @@ static void ctcp_msg(const char *data, IRC_SERVER_REC *server,
if (args != NULL) *args++ = '\0'; else args = "";
g_strdown(str+9);
- if (!signal_emit(str, 5, args, server, nick, addr, target)) {
+ if (!signal_emit(str, 5, server, args, nick, addr, target)) {
signal_emit("default ctcp msg", 5,
- data, server, nick, addr, target);
+ server, data, nick, addr, target);
}
g_free(str);
}
-static void ctcp_reply(const char *data, IRC_SERVER_REC *server,
+static void ctcp_reply(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr, const char *target)
{
char *args, *str;
@@ -148,14 +149,14 @@ static void ctcp_reply(const char *data, IRC_SERVER_REC *server,
if (args != NULL) *args++ = '\0'; else args = "";
g_strdown(str+11);
- if (!signal_emit(str, 5, args, server, nick, addr, target)) {
+ if (!signal_emit(str, 5, server, args, nick, addr, target)) {
signal_emit("default ctcp reply", 5,
- data, server, nick, addr, target);
+ server, data, nick, addr, target);
}
g_free(str);
}
-static void event_privmsg(const char *data, IRC_SERVER_REC *server,
+static void event_privmsg(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
char *params, *target, *msg, *ptr;
@@ -170,14 +171,14 @@ static void event_privmsg(const char *data, IRC_SERVER_REC *server,
ptr = strrchr(++msg, 1);
if (ptr != NULL) *ptr = '\0';
- signal_emit("ctcp msg", 5, msg, server, nick, addr, target);
+ signal_emit("ctcp msg", 5, server, msg, nick, addr, target);
signal_stop();
}
g_free(params);
}
-static void event_notice(const char *data, IRC_SERVER_REC *server,
+static void event_notice(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
char *params, *target, *ptr, *msg;
@@ -191,7 +192,7 @@ static void event_notice(const char *data, IRC_SERVER_REC *server,
ptr = strrchr(++msg, 1);
if (ptr != NULL) *ptr = '\0';
- signal_emit("ctcp reply", 5, msg, server, nick, addr, target);
+ signal_emit("ctcp reply", 5, server, msg, nick, addr, target);
signal_stop();
}
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 951ce1bb..cf127908 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -472,7 +472,7 @@ static void cmd_nick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
cmd_params_free(free_arg);
}
-static void sig_nickchange_over(const char *data, IRC_SERVER_REC *server,
+static void sig_nickchange_over(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
char *signal;
@@ -481,7 +481,7 @@ static void sig_nickchange_over(const char *data, IRC_SERVER_REC *server,
signal = g_strconcat("event ", current_server_event, NULL);
g_strdown(signal+6);
- signal_emit(signal, 4, data, server, nick, addr);
+ signal_emit(signal, 4, server, data, nick, addr);
g_free(signal);
}
@@ -558,11 +558,11 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
cmd_params_free(free_arg);
}
-static void event_whois(const char *data, IRC_SERVER_REC *server,
+static void event_whois(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
server->whois_found = TRUE;
- signal_emit("event 311", 4, data, server, nick, addr);
+ signal_emit("event 311", 4, server, data, nick, addr);
}
static void sig_whois_not_found(const char *data, IRC_SERVER_REC *server)
@@ -582,10 +582,10 @@ static void sig_whois_not_found(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_whowas(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
+static void event_whowas(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr)
{
server->whowas_found = TRUE;
- signal_emit("event 314", 4, data, server, nick, addr);
+ signal_emit("event 314", 4, server, data, nick, addr);
}
/* SYNTAX: WHOWAS [<nicks> [<count>]] */
diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 3f71a6a1..fba3a20a 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -75,7 +75,7 @@ static char *expando_userhost(SERVER_REC *server, void *item, int *free_ret)
return g_strconcat(username, "@", hostname, NULL);;
}
-static void event_join(const char *data, IRC_SERVER_REC *server,
+static void event_join(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
g_return_if_fail(nick != NULL);
@@ -91,7 +91,7 @@ void irc_expandos_init(void)
last_join = NULL;
expando_create(":", expando_lastjoin,
- "event join", EXPANDO_ARG_SERVER2, NULL);
+ "event join", EXPANDO_ARG_SERVER, NULL);
expando_create("H", expando_server_numeric,
"server event", EXPANDO_ARG_SERVER, NULL);
expando_create("S", expando_servername,
@@ -101,7 +101,7 @@ void irc_expandos_init(void)
"window changed", EXPANDO_ARG_NONE,
"window server changed", EXPANDO_ARG_WINDOW, NULL);
- expando_add_signal("I", "event invite", EXPANDO_ARG_SERVER2);
+ expando_add_signal("I", "event invite", EXPANDO_ARG_SERVER);
signal_add("event join", (SIGNAL_FUNC) event_join);
}
diff --git a/src/irc/core/irc-log.c b/src/irc/core/irc-log.c
index cfb5afb8..2b23bdf8 100644
--- a/src/irc/core/irc-log.c
+++ b/src/irc/core/irc-log.c
@@ -37,7 +37,7 @@ static void sig_log_written(LOG_REC *log)
away_msgs++;
}
-static void event_away(const char *data, IRC_SERVER_REC *server)
+static void event_away(IRC_SERVER_REC *server, const char *data)
{
const char *fname, *levelstr;
LOG_REC *log;
@@ -71,7 +71,7 @@ static void event_away(const char *data, IRC_SERVER_REC *server)
away_msgs = 0;
}
-static void event_unaway(const char *data, IRC_SERVER_REC *server)
+static void event_unaway(IRC_SERVER_REC *server, const char *data)
{
const char *fname;
LOG_REC *log;
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 9b8de036..036a3e9f 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -53,7 +53,7 @@ char *irc_nick_strip(const char *nick)
return stripped;
}
-static void event_names_list(const char *data, SERVER_REC *server)
+static void event_names_list(SERVER_REC *server, const char *data)
{
CHANNEL_REC *chanrec;
char *params, *type, *channel, *names, *ptr;
@@ -95,7 +95,7 @@ static void event_names_list(const char *data, SERVER_REC *server)
g_free(params);
}
-static void event_end_of_names(const char *data, SERVER_REC *server)
+static void event_end_of_names(SERVER_REC *server, const char *data)
{
char *params, *channel;
IRC_CHANNEL_REC *chanrec;
@@ -113,7 +113,7 @@ static void event_end_of_names(const char *data, SERVER_REC *server)
g_free(params);
}
-static void event_who(const char *data, SERVER_REC *server)
+static void event_who(SERVER_REC *server, const char *data)
{
char *params, *nick, *channel, *user, *host, *stat, *realname, *hops;
CHANNEL_REC *chanrec;
@@ -149,7 +149,7 @@ static void event_who(const char *data, SERVER_REC *server)
g_free(params);
}
-static void event_whois(const char *data, IRC_SERVER_REC *server)
+static void event_whois(IRC_SERVER_REC *server, const char *data)
{
char *params, *nick, *realname;
GSList *nicks, *tmp;
@@ -179,7 +179,7 @@ static void event_whois(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_whois_away(const char *data, SERVER_REC *server)
+static void event_whois_away(SERVER_REC *server, const char *data)
{
char *params, *nick, *awaymsg;
@@ -191,7 +191,7 @@ static void event_whois_away(const char *data, SERVER_REC *server)
g_free(params);
}
-static void event_whois_ircop(const char *data, SERVER_REC *server)
+static void event_whois_ircop(SERVER_REC *server, const char *data)
{
char *params, *nick, *awaymsg;
@@ -203,12 +203,12 @@ static void event_whois_ircop(const char *data, SERVER_REC *server)
g_free(params);
}
-static void event_end_of_whois(const char *data, IRC_SERVER_REC *server)
+static void event_end_of_whois(IRC_SERVER_REC *server, const char *data)
{
server->whois_coming = FALSE;
}
-static void event_nick_in_use(const char *data, IRC_SERVER_REC *server)
+static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
{
char *str;
int n;
@@ -251,7 +251,7 @@ static void event_nick_in_use(const char *data, IRC_SERVER_REC *server)
irc_send_cmdv(server, "NICK %s", server->nick);
}
-static void event_target_unavailable(const char *data, IRC_SERVER_REC *server)
+static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
@@ -260,13 +260,13 @@ static void event_target_unavailable(const char *data, IRC_SERVER_REC *server)
params = event_get_params(data, 2, NULL, &channel);
if (!ischannel(*channel)) {
/* nick is unavailable. */
- event_nick_in_use(data, server);
+ event_nick_in_use(server, data);
}
g_free(params);
}
-static void event_nick(const char *data, SERVER_REC *server,
+static void event_nick(SERVER_REC *server, const char *data,
const char *orignick)
{
IRC_CHANNEL_REC *channel;
@@ -308,7 +308,7 @@ static void event_nick(const char *data, SERVER_REC *server,
g_free(params);
}
-static void event_userhost(const char *data, SERVER_REC *server)
+static void event_userhost(SERVER_REC *server, const char *data)
{
char *params, *hosts, **phosts, **pos, *ptr;
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 6d16a030..9314aaab 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -56,7 +56,7 @@ static void sig_query_create(QUERY_REC **query,
signal_stop();
}
-static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
+static void event_privmsg(IRC_SERVER_REC *server, const char *data, const char *nick, const char *addr)
{
char *params, *target, *msg;
QUERY_REC *query;
@@ -79,7 +79,7 @@ static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *
g_free(params);
}
-static void event_nick(const char *data, IRC_SERVER_REC *server, const char *orignick)
+static void event_nick(IRC_SERVER_REC *server, const char *data, const char *orignick)
{
char *params, *nick;
GSList *tmp;
diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c
index 2280cc0e..16adee12 100644
--- a/src/irc/core/irc-servers-reconnect.c
+++ b/src/irc/core/irc-servers-reconnect.c
@@ -101,7 +101,7 @@ static void sig_connected(IRC_SERVER_REC *server)
}
}
-static void event_kill(const char *data, IRC_SERVER_REC *server,
+static void event_kill(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
time_t new_connect;
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index fb2c97a3..ef3b328a 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -352,7 +352,7 @@ static int sig_set_user_mode(IRC_SERVER_REC *server)
return 0;
}
-static void event_connected(const char *data, IRC_SERVER_REC *server, const char *from)
+static void event_connected(IRC_SERVER_REC *server, const char *data, const char *from)
{
char *params, *nick;
const char *mode;
@@ -389,7 +389,7 @@ static void event_connected(const char *data, IRC_SERVER_REC *server, const char
g_free(params);
}
-static void event_server_info(const char *data, IRC_SERVER_REC *server)
+static void event_server_info(IRC_SERVER_REC *server, const char *data)
{
char *params, *ircd_version, *usermodes, *chanmodes;
@@ -408,14 +408,14 @@ static void event_server_info(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_server_banned(const char *data, IRC_SERVER_REC *server)
+static void event_server_banned(IRC_SERVER_REC *server, const char *data)
{
g_return_if_fail(server != NULL);
server->banned = TRUE;
}
-static void event_error(const char *data, IRC_SERVER_REC *server)
+static void event_error(IRC_SERVER_REC *server, const char *data)
{
g_return_if_fail(server != NULL);
@@ -424,7 +424,7 @@ static void event_error(const char *data, IRC_SERVER_REC *server)
server->banned = TRUE;
}
-static void event_ping(const char *data, IRC_SERVER_REC *server)
+static void event_ping(IRC_SERVER_REC *server, const char *data)
{
char *str;
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index 465a78e9..fece504c 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -265,8 +265,8 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line, const cha
current_server_event = event+6;
g_strdown(callcmd);
- if (!signal_emit(callcmd, 4, args, server, nick, address))
- signal_emit_id(signal_default_event, 4, line, server, nick, address);
+ if (!signal_emit(callcmd, 4, server, args, nick, address))
+ signal_emit_id(signal_default_event, 4, server, line, nick, address);
current_server_event = NULL;
g_free(callcmd);
diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c
index 2107801d..8b934dd7 100644
--- a/src/irc/core/lag.c
+++ b/src/irc/core/lag.c
@@ -81,7 +81,9 @@ static void lag_get(IRC_SERVER_REC *server)
/* we use "ctcp reply" signal here, because "ctcp reply irssilag" can be
ignored with /IGNORE * CTCPS */
-static void sig_irssilag(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr, const char *target)
+static void sig_irssilag(IRC_SERVER_REC *server, const char *data,
+ const char *nick, const char *addr,
+ const char *target)
{
GTimeVal now, sent;
LAG_REC *lag;
diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c
index a1ffb0b1..701d2a33 100644
--- a/src/irc/core/massjoin.c
+++ b/src/irc/core/massjoin.c
@@ -33,7 +33,7 @@ static int massjoin_max_joins;
/* Massjoin support - really useful when trying to do things (like op/deop)
to people after netjoins. It sends
"massjoin #channel nick!user@host nick2!user@host ..." signals */
-static void event_join(const char *data, IRC_SERVER_REC *server,
+static void event_join(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
char *params, *channel, *ptr;
@@ -87,7 +87,7 @@ static void event_join(const char *data, IRC_SERVER_REC *server,
chanrec->massjoins++;
}
-static void event_part(const char *data, IRC_SERVER_REC *server,
+static void event_part(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *addr)
{
char *params, *channel, *reason;
@@ -123,7 +123,7 @@ static void event_part(const char *data, IRC_SERVER_REC *server,
g_free(params);
}
-static void event_quit(const char *data, IRC_SERVER_REC *server,
+static void event_quit(IRC_SERVER_REC *server, const char *data,
const char *nick)
{
IRC_CHANNEL_REC *channel;
@@ -153,7 +153,7 @@ static void event_quit(const char *data, IRC_SERVER_REC *server,
g_slist_free(nicks);
}
-static void event_kick(const char *data, IRC_SERVER_REC *server)
+static void event_kick(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel, *nick, *reason;
IRC_CHANNEL_REC *chanrec;
diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c
index 5f9b5977..50d57b3a 100644
--- a/src/irc/core/mode-lists.c
+++ b/src/irc/core/mode-lists.c
@@ -169,7 +169,7 @@ static void channel_destroyed(IRC_CHANNEL_REC *channel)
invitelist_free(channel);
}
-static void event_banlist(const char *data, IRC_SERVER_REC *server)
+static void event_banlist(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel, *ban, *setby, *tims;
@@ -186,7 +186,7 @@ static void event_banlist(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_ebanlist(const char *data, IRC_SERVER_REC *server)
+static void event_ebanlist(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel, *ban, *setby, *tims;
@@ -203,7 +203,7 @@ static void event_ebanlist(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_invite_list(const char *data, IRC_SERVER_REC *server)
+static void event_invite_list(IRC_SERVER_REC *server, const char *data)
{
IRC_CHANNEL_REC *chanrec;
char *params, *channel, *invite;
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index 5db9084d..a0f7118c 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -352,7 +352,7 @@ static void parse_user_mode(IRC_SERVER_REC *server, const char *modestr)
g_free_not_null(oldmode);
}
-static void event_user_mode(const char *data, IRC_SERVER_REC *server)
+static void event_user_mode(IRC_SERVER_REC *server, const char *data)
{
char *params, *nick, *mode;
@@ -364,7 +364,7 @@ static void event_user_mode(const char *data, IRC_SERVER_REC *server)
g_free(params);
}
-static void event_mode(const char *data, IRC_SERVER_REC *server,
+static void event_mode(IRC_SERVER_REC *server, const char *data,
const char *nick)
{
IRC_CHANNEL_REC *chanrec;
@@ -388,7 +388,7 @@ static void event_mode(const char *data, IRC_SERVER_REC *server,
g_free(params);
}
-static void event_away(const char *data, IRC_SERVER_REC *server)
+static void event_away(IRC_SERVER_REC *server, const char *data)
{
g_return_if_fail(server != NULL);
@@ -396,7 +396,7 @@ static void event_away(const char *data, IRC_SERVER_REC *server)
signal_emit("away mode changed", 1, server);
}
-static void event_unaway(const char *data, IRC_SERVER_REC *server)
+static void event_unaway(IRC_SERVER_REC *server, const char *data)
{
g_return_if_fail(server != NULL);
diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c
index 5eeb5503..3abd1717 100644
--- a/src/irc/core/netsplit.c
+++ b/src/irc/core/netsplit.c
@@ -261,7 +261,7 @@ static void split_set_timeout(void *key, NETSPLIT_REC *rec, NETSPLIT_REC *orig)
rec->destroy = time(NULL)+60;
}
-static void event_join(const char *data, IRC_SERVER_REC *server,
+static void event_join(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
NETSPLIT_REC *rec;
@@ -283,7 +283,7 @@ static void event_join(const char *data, IRC_SERVER_REC *server,
/* remove the nick from netsplit, but do it last so that other "event join"
signal handlers can check if the join was a netjoin */
-static void event_join_last(const char *data, IRC_SERVER_REC *server,
+static void event_join_last(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
NETSPLIT_REC *rec;
@@ -295,7 +295,7 @@ static void event_join_last(const char *data, IRC_SERVER_REC *server,
}
}
-static void event_quit(const char *data, IRC_SERVER_REC *server,
+static void event_quit(IRC_SERVER_REC *server, const char *data,
const char *nick, const char *address)
{
g_return_if_fail(data != NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-05 19:11:49 +0000