Cleaned up some code.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@321 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-06-11 00:58:15 +00:00 committed by cras
parent b44acaf46e
commit e6187b66e9

View File

@ -240,9 +240,9 @@ static void event_notice(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar
g_free(params);
}
static void event_join(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_join(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
gchar *params, *channel, *tmp;
char *params, *channel, *tmp;
g_return_if_fail(data != NULL);
@ -255,9 +255,9 @@ static void event_join(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *
g_free(params);
}
static void event_part(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_part(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
gchar *params, *channel, *reason;
char *params, *channel, *reason;
g_return_if_fail(data != NULL);
@ -315,15 +315,14 @@ static void event_quit(const char *data, IRC_SERVER_REC *server, const char *nic
}
}
static void event_kick(gchar *data, IRC_SERVER_REC *server, gchar *kicker, gchar *addr)
static void event_kick(const char *data, IRC_SERVER_REC *server, const char *kicker, const char *addr)
{
gchar *params, *channel, *nick, *reason;
char *params, *channel, *nick, *reason;
g_return_if_fail(data != NULL);
params = event_get_params(data, 3 | PARAM_FLAG_GETREST, &channel, &nick, &reason);
if (!ignore_check(server, kicker, addr, channel, reason, MSGLEVEL_KICKS))
{
if (!ignore_check(server, kicker, addr, channel, reason, MSGLEVEL_KICKS)) {
printformat(server, channel, MSGLEVEL_KICKS,
IRCTXT_KICK, nick, channel, kicker, reason);
}
@ -421,9 +420,9 @@ static void event_pong(const char *data, IRC_SERVER_REC *server, const char *nic
g_free(params);
}
static void event_invite(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_invite(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
gchar *params, *channel;
char *params, *channel;
g_return_if_fail(data != NULL);
@ -433,9 +432,9 @@ static void event_invite(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar
g_free(params);
}
static void event_topic(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_topic(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
gchar *params, *channel, *topic;
char *params, *channel, *topic;
g_return_if_fail(data != NULL);
@ -448,7 +447,7 @@ static void event_topic(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar
g_free(params);
}
static void event_error(gchar *data, IRC_SERVER_REC *server)
static void event_error(const char *data, IRC_SERVER_REC *server)
{
g_return_if_fail(data != NULL);
@ -456,19 +455,19 @@ static void event_error(gchar *data, IRC_SERVER_REC *server)
printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_ERROR, data);
}
static void event_wallops(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_wallops(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
g_return_if_fail(data != NULL);
if (*data == ':') data++;
if (!ignore_check(server, nick, addr, NULL, data, MSGLEVEL_WALLOPS))
{
if (ignore_check(server, nick, addr, NULL, data, MSGLEVEL_WALLOPS))
return;
if (g_strncasecmp(data, "\001ACTION", 7) != 0)
printformat(server, NULL, MSGLEVEL_WALLOPS, IRCTXT_WALLOPS, nick, data);
else
{
else {
/* Action in WALLOP */
gint len;
int len;
data = g_strdup(data);
len = strlen(data);
@ -477,33 +476,29 @@ static void event_wallops(gchar *data, IRC_SERVER_REC *server, gchar *nick, gcha
g_free(data);
}
msg_beep_check(server, MSGLEVEL_WALLOPS);
}
}
static void channel_sync(CHANNEL_REC *channel)
{
g_return_if_fail(channel != NULL);
printformat(channel->server, channel->name, MSGLEVEL_CLIENTNOTICE|MSGLEVEL_NO_ACT, IRCTXT_CHANNEL_SYNCED,
channel->name, (glong) (time(NULL)-channel->createtime));
printformat(channel->server, channel->name, MSGLEVEL_CLIENTNOTICE|MSGLEVEL_NO_ACT,
IRCTXT_CHANNEL_SYNCED, channel->name, (long) (time(NULL)-channel->createtime));
}
static void event_connected(IRC_SERVER_REC *server)
{
gchar *str;
char *nick;
g_return_if_fail(server != NULL);
if (*settings_get_str("default_nick") == '\0' ||
g_strcasecmp(server->nick, settings_get_str("default_nick")) == 0)
nick = settings_get_str("default_nick");
if (*nick == '\0' || g_strcasecmp(server->nick, nick) == 0)
return;
/* someone has our nick, find out who. */
str = g_strdup_printf("WHOIS %s", settings_get_str("default_nick"));
irc_send_cmd(server, str);
g_free(str);
server_redirect_event((SERVER_REC *) server, settings_get_str("default_nick"), 1,
irc_send_cmdv(server, "WHOIS %s", nick);
server_redirect_event((SERVER_REC *) server, nick, 1,
"event 318", "event empty", 1,
"event 401", "event empty", 1,
"event 311", "nickfind event whois", 1,
@ -515,9 +510,9 @@ static void event_connected(IRC_SERVER_REC *server)
}
static void event_nickfind_whois(gchar *data, IRC_SERVER_REC *server)
static void event_nickfind_whois(const char *data, IRC_SERVER_REC *server)
{
gchar *params, *nick, *user, *host, *realname;
char *params, *nick, *user, *host, *realname;
g_return_if_fail(data != NULL);
@ -526,7 +521,7 @@ static void event_nickfind_whois(gchar *data, IRC_SERVER_REC *server)
g_free(params);
}
static void event_ban_type_changed(gchar *bantype)
static void event_ban_type_changed(const char *bantype)
{
GString *str;
@ -538,21 +533,17 @@ static void event_ban_type_changed(gchar *bantype)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, "Host");
else if (strcmp(bantype, "D") == 0)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_BANTYPE, "Domain");
else
{
else {
str = g_string_new("Custom:");
if (*bantype == 'N')
{
if (*bantype == 'N') {
g_string_append(str, " Nick");
bantype++;
}
if (*bantype == 'U')
{
if (*bantype == 'U') {
g_string_append(str, " User");
bantype++;
}
if (*bantype == 'H')
{
if (*bantype == 'H') {
g_string_append(str, " Host");
bantype++;
}
@ -597,7 +588,7 @@ static void sig_server_reconnect_removed(RECONNECT_REC *reconnect)
reconnect->conn->ircnet == NULL ? "" : reconnect->conn->ircnet);
}
static void sig_server_reconnect_not_found(gchar *tag)
static void sig_server_reconnect_not_found(const char *tag)
{
g_return_if_fail(tag != NULL);
@ -605,7 +596,7 @@ static void sig_server_reconnect_not_found(gchar *tag)
IRCTXT_RECONNECT_NOT_FOUND, tag);
}
static void event_received(gchar *data, IRC_SERVER_REC *server, gchar *nick, gchar *addr)
static void event_received(const char *data, IRC_SERVER_REC *server, const char *nick, const char *addr)
{
char *params, *cmd, *args, *ptr;