zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-17 23:52:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace deprecated g_str[n]casecmp with g_ascii_str[n]cmp.

Browse source
This commit is contained in:
David Hill 2014-06-10 12:06:19 -04:00
commit 0d4f13d20f
63 changed files with 168 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/irc/core/bans.c
View file

@ -150,7 +150,7 @@ void ban_remove(IRC_CHANNEL_REC *channel, const char *bans)
if (!found) {
rec = NULL;
if (!g_strcasecmp(*ban, BAN_LAST)) {
if (!g_ascii_strcasecmp(*ban, BAN_LAST)) {
/* unnbanning last set ban */
rec = g_slist_nth_data(channel->banlist,
g_slist_length(channel->banlist) - 1);

8
src/irc/core/channel-events.c
View file

@ -199,7 +199,7 @@ static IRC_CHANNEL_REC *channel_find_unjoined(IRC_SERVER_REC *server,
if (!IS_IRC_CHANNEL(rec) || rec->joined)
continue;
if (g_strncasecmp(channel, rec->name, len) == 0 &&
if (g_ascii_strncasecmp(channel, rec->name, len) == 0 &&
(len > 20 || rec->name[len] == '\0'))
return rec;
}
@ -214,7 +214,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data, const char *nic
g_return_if_fail(data != NULL);
if (g_strcasecmp(nick, server->nick) != 0) {
if (g_ascii_strcasecmp(nick, server->nick) != 0) {
/* someone else joined channel, no need to do anything */
return;
}
@ -286,7 +286,7 @@ static void event_part(IRC_SERVER_REC *server, const char *data, const char *nic
g_return_if_fail(data != NULL);
if (g_strcasecmp(nick, server->nick) != 0) {
if (g_ascii_strcasecmp(nick, server->nick) != 0) {
/* someone else part, no need to do anything here */
return;
}
@ -311,7 +311,7 @@ static void event_kick(IRC_SERVER_REC *server, const char *data)
params = event_get_params(data, 3, &channel, &nick, &reason);
if (g_strcasecmp(nick, server->nick) != 0) {
if (g_ascii_strcasecmp(nick, server->nick) != 0) {
/* someone else was kicked, no need to do anything */
g_free(params);
return;

2
src/irc/core/channel-rejoin.c
View file

@ -58,7 +58,7 @@ static REJOIN_REC *rejoin_find(IRC_SERVER_REC *server, const char *channel)
for (tmp = server->rejoin_channels; tmp != NULL; tmp = tmp->next) {
REJOIN_REC *rec = tmp->data;
if (g_strcasecmp(rec->channel, channel) == 0)
if (g_ascii_strcasecmp(rec->channel, channel) == 0)
return rec;
}

2
src/irc/core/ctcp.c
View file

@ -44,7 +44,7 @@ static CTCP_CMD_REC *ctcp_cmd_find(const char *name)
for (tmp = ctcp_cmds; tmp != NULL; tmp = tmp->next) {
CTCP_CMD_REC *rec = tmp->data;
if (g_strcasecmp(rec->name, name) == 0)
if (g_ascii_strcasecmp(rec->name, name) == 0)
return rec;
}

2
src/irc/core/irc-commands.c
View file

@ -418,7 +418,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
g_string_printf(tmpstr, "WHOIS %s", query);
else {
g_string_printf(tmpstr, "WHOIS %s %s", qserver, query);
if (g_strcasecmp(qserver, query) == 0)
if (g_ascii_strcasecmp(qserver, query) == 0)
event_402 = "whois event not found";
}

2
src/irc/core/irc-expandos.c
View file

@ -116,7 +116,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
{
g_return_if_fail(nick != NULL);
if (g_strcasecmp(nick, server->nick) != 0) {
if (g_ascii_strcasecmp(nick, server->nick) != 0) {
g_free_not_null(last_join);
last_join = g_strdup(nick);
}

8
src/irc/core/irc-nicklist.c
View file

@ -342,9 +342,9 @@ static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)
}
/* nick already in use - need to change it .. */
if (g_strcasecmp(server->nick, server->connrec->nick) == 0 &&
if (g_ascii_strcasecmp(server->nick, server->connrec->nick) == 0 &&
server->connrec->alternate_nick != NULL &&
g_strcasecmp(server->connrec->alternate_nick, server->nick) != 0) {
g_ascii_strcasecmp(server->connrec->alternate_nick, server->nick) != 0) {
/* first try, so try the alternative nick.. */
g_free(server->nick);
server->nick = g_strdup(server->connrec->alternate_nick);
@ -400,10 +400,10 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
params = event_get_params(data, 1, &nick);
if (g_strcasecmp(orignick, server->nick) == 0) {
if (g_ascii_strcasecmp(orignick, server->nick) == 0) {
/* You changed your nick */
if (server->last_nick != NULL &&
g_strcasecmp(server->last_nick, nick) == 0) {
g_ascii_strcasecmp(server->last_nick, nick) == 0) {
/* changed with /NICK - keep it as wanted nick */
g_free(server->connrec->nick);
server->connrec->nick = g_strdup(nick);

3
src/irc/core/irc-servers.c
View file

@ -90,7 +90,8 @@ static void send_message(SERVER_REC *server, const char *target,
if (*target == '!') {
/* !chan -> !12345chan */
channel = channel_find(server, target);
if (channel != NULL && g_strcasecmp(channel->name, target) != 0)
if (channel != NULL &&
g_ascii_strcasecmp(channel->name, target) != 0)
target = channel->name;
}

8
src/irc/core/massjoin.c
View file

@ -42,7 +42,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
if (g_strcasecmp(nick, server->nick) == 0) {
if (g_ascii_strcasecmp(nick, server->nick) == 0) {
/* You joined, no need to do anything here */
return;
}
@ -104,7 +104,7 @@ static void event_part(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
if (g_strcasecmp(nick, server->nick) == 0) {
if (g_ascii_strcasecmp(nick, server->nick) == 0) {
/* you left channel, no need to do anything here */
return;
}
@ -140,7 +140,7 @@ static void event_quit(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
if (g_strcasecmp(nick, server->nick) == 0) {
if (g_ascii_strcasecmp(nick, server->nick) == 0) {
/* you quit, don't do anything here */
return;
}
@ -171,7 +171,7 @@ static void event_kick(IRC_SERVER_REC *server, const char *data)
params = event_get_params(data, 3, &channel, &nick, &reason);
if (g_strcasecmp(nick, server->nick) == 0) {
if (g_ascii_strcasecmp(nick, server->nick) == 0) {
/* you were kicked, no need to do anything */
g_free(params);
return;

2
src/irc/core/mode-lists.c
View file

@ -53,7 +53,7 @@ BAN_REC *banlist_find(GSList *list, const char *ban)
for (tmp = list; tmp != NULL; tmp = tmp->next) {
BAN_REC *rec = tmp->data;
if (g_strcasecmp(rec->ban, ban) == 0)
if (g_ascii_strcasecmp(rec->ban, ban) == 0)
return rec;
}

6
src/irc/core/modes.c
View file

@ -301,7 +301,7 @@ void modes_type_prefix(IRC_CHANNEL_REC *channel, const char *setby,
{
int umode = (unsigned char) mode;
if (g_strcasecmp(channel->server->nick, arg) == 0) {
if (g_ascii_strcasecmp(channel->server->nick, arg) == 0) {
/* see if we need to update channel->chanop */
const char *prefix =
g_hash_table_lookup(channel->server->isupport, "PREFIX");
@ -692,7 +692,7 @@ static int get_wildcard_nicks(GString *output, const char *mask,
(voice == 1 && !rec->voice) || (voice == 0 && rec->voice))
continue;
if (g_strcasecmp(rec->nick, channel->server->nick) == 0)
if (g_ascii_strcasecmp(rec->nick, channel->server->nick) == 0)
continue;
g_string_append_printf(output, "%s ", rec->nick);
@ -859,7 +859,7 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
} else if (ischannel(*target))
channel_set_mode(server, target, mode);
else {
if (g_strcasecmp(target, server->nick) == 0) {
if (g_ascii_strcasecmp(target, server->nick) == 0) {
server_redirect_event(server, "mode user", 1, target, -1, NULL,
"event mode", "requested usermode change", NULL);
}

12
src/irc/core/netsplit.c
View file

@ -43,8 +43,8 @@ static NETSPLIT_SERVER_REC *netsplit_server_find(IRC_SERVER_REC *server,
for (tmp = server->split_servers; tmp != NULL; tmp = tmp->next) {
NETSPLIT_SERVER_REC *rec = tmp->data;
if (g_strcasecmp(rec->server, servername) == 0 &&
g_strcasecmp(rec->destserver, destserver) == 0)
if (g_ascii_strcasecmp(rec->server, servername) == 0 &&
g_ascii_strcasecmp(rec->destserver, destserver) == 0)
return rec;
}
@ -191,7 +191,7 @@ NETSPLIT_REC *netsplit_find(IRC_SERVER_REC *server, const char *nick,
if (rec == NULL) return NULL;
return (address == NULL ||
g_strcasecmp(rec->address, address) == 0) ? rec : NULL;
g_ascii_strcasecmp(rec->address, address) == 0) ? rec : NULL;
}
NETSPLIT_CHAN_REC *netsplit_find_channel(IRC_SERVER_REC *server,
@ -211,7 +211,7 @@ NETSPLIT_CHAN_REC *netsplit_find_channel(IRC_SERVER_REC *server,
for (tmp = rec->channels; tmp != NULL; tmp = tmp->next) {
NETSPLIT_CHAN_REC *rec = tmp->data;
if (g_strcasecmp(rec->name, channel) == 0)
if (g_ascii_strcasecmp(rec->name, channel) == 0)
return rec;
}
@ -315,7 +315,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data,
/* check if split is over */
rec = g_hash_table_lookup(server->splits, nick);
if (rec != NULL && g_strcasecmp(rec->address, address) == 0) {
if (rec != NULL && g_ascii_strcasecmp(rec->address, address) == 0) {
/* yep, looks like it is. for same people that had the same
splitted servers set the timeout to one minute.
@ -350,7 +350,7 @@ static void event_quit(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
if (*data == ':') data++;
if (g_strcasecmp(nick, server->nick) != 0 && quitmsg_is_split(data)) {
if (g_ascii_strcasecmp(nick, server->nick) != 0 && quitmsg_is_split(data)) {
/* netsplit! */
netsplit_add(server, nick, address, data);
}

8
src/irc/dcc/dcc-chat.c
View file

@ -103,7 +103,7 @@ CHAT_DCC_REC *dcc_chat_find_id(const char *id)
CHAT_DCC_REC *dcc = tmp->data;
if (IS_DCC_CHAT(dcc) && dcc->id != NULL &&
g_strcasecmp(dcc->id, id) == 0)
g_ascii_strcasecmp(dcc->id, id) == 0)
return dcc;
}
@ -121,7 +121,7 @@ static CHAT_DCC_REC *dcc_chat_find_nick(IRC_SERVER_REC *server,
CHAT_DCC_REC *dcc = tmp->data;
if (IS_DCC_CHAT(dcc) && dcc->server == server &&
g_strcasecmp(dcc->nick, nick) == 0)
g_ascii_strcasecmp(dcc->nick, nick) == 0)
return dcc;
}
@ -562,7 +562,7 @@ static void cmd_dcc_close(char *data, SERVER_REC *server)
next = tmp->next;
if (IS_DCC_CHAT(dcc) && dcc->id != NULL &&
g_strcasecmp(dcc->id, nick) == 0) {
g_ascii_strcasecmp(dcc->id, nick) == 0) {
found = TRUE;
if (!dcc_is_connected(dcc) && IS_IRC_SERVER(server))
dcc_reject(DCC(dcc), IRC_SERVER(server));
@ -777,7 +777,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(orignick != NULL);
params = event_get_params(data, 1, &nick);
if (g_strcasecmp(nick, orignick) == 0) {
if (g_ascii_strcasecmp(nick, orignick) == 0) {
/* shouldn't happen, but just to be sure irssi doesn't
get into infinite loop */
g_free(params);

2
src/irc/dcc/dcc-get.c
View file

@ -549,7 +549,7 @@ void cmd_dcc_receive(const char *data, DCC_GET_FUNC accept_func,
GET_DCC_REC *dcc = tmp->data;
next = tmp->next;
if (IS_DCC_GET(dcc) && g_strcasecmp(dcc->nick, nick) == 0 &&
if (IS_DCC_GET(dcc) && g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
(dcc_is_waiting_user(dcc) || dcc->from_dccserver) &&
(*fname == '\0' || strcmp(dcc->arg, fname) == 0)) {
found = TRUE;

5
src/irc/dcc/dcc-queue.c
View file

@ -47,11 +47,12 @@ int dcc_queue_old(const char *nick, const char *servertag)
if (rec == NULL)
continue;
if (*nick != '\0' && g_strcasecmp(nick, rec->nick) != 0)
if (*nick != '\0' &&
g_ascii_strcasecmp(nick, rec->nick) != 0)
continue;
if (*servertag != '\0' &&
g_strcasecmp(servertag, rec->servertag) != 0)
g_ascii_strcasecmp(servertag, rec->servertag) != 0)
continue;
/* found a queue matching nick/server! */

3
src/irc/dcc/dcc-resume.c
View file

@ -37,7 +37,8 @@ static FILE_DCC_REC *dcc_resume_find(int type, const char *nick, int port)
FILE_DCC_REC *dcc = tmp->data;
if (dcc->type == type && !dcc_is_connected(dcc) &&
dcc->port == port && g_strcasecmp(dcc->nick, nick) == 0)
dcc->port == port &&
g_ascii_strcasecmp(dcc->nick, nick) == 0)
return dcc;
}

2
src/irc/dcc/dcc-send.c
View file

@ -180,7 +180,7 @@ static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server,
chat = item_get_dcc(item);
if (chat != NULL &&
(chat->mirc_ctcp || g_strcasecmp(nick, chat->nick) != 0))
(chat->mirc_ctcp || g_ascii_strcasecmp(nick, chat->nick) != 0))
chat = NULL;
if (IS_IRC_SERVER(server) && server->connected)

8
src/irc/dcc/dcc.c
View file

@ -148,7 +148,7 @@ DCC_REC *dcc_find_request(int type, const char *nick, const char *arg)
DCC_REC *dcc = tmp->data;
if (dcc->type == type && !dcc_is_connected(dcc) &&
g_strcasecmp(dcc->nick, nick) == 0 &&
g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
(arg == NULL || strcmp(dcc->arg, arg) == 0))
return dcc;
}
@ -287,7 +287,7 @@ static void sig_connected(IRC_SERVER_REC *server)
DCC_REC *dcc = tmp->data;
if (dcc->server == NULL && dcc->servertag != NULL &&
g_strcasecmp(dcc->servertag, server->tag) == 0) {
g_ascii_strcasecmp(dcc->servertag, server->tag) == 0) {
dcc->server = server;
g_free(dcc->mynick);
dcc->mynick = g_strdup(server->nick);
@ -479,7 +479,7 @@ static void event_no_such_nick(IRC_SERVER_REC *server, char *data)
next = tmp->next;
if (!dcc_is_connected(dcc) && dcc->server == server &&
dcc->nick != NULL && g_strcasecmp(dcc->nick, nick) == 0)
dcc->nick != NULL && g_ascii_strcasecmp(dcc->nick, nick) == 0)
dcc_close(dcc);
}
@ -515,7 +515,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
DCC_REC *dcc = tmp->data;
next = tmp->next;
if (dcc->type == type && g_strcasecmp(dcc->nick, nick) == 0 &&
if (dcc->type == type && g_ascii_strcasecmp(dcc->nick, nick) == 0 &&
(*arg == '\0' || strcmp(dcc->arg, arg) == 0)) {
dcc_reject(dcc, server);
found = TRUE;

8
src/irc/flood/flood.c
View file

@ -172,7 +172,7 @@ static FLOOD_ITEM_REC *flood_find(FLOOD_REC *flood, int level,
FLOOD_ITEM_REC *rec = tmp->data;
if (rec->level == level &&
g_strcasecmp(rec->target, target) == 0)
g_ascii_strcasecmp(rec->target, target) == 0)
return rec;
}
@ -245,7 +245,7 @@ static void flood_privmsg(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
g_return_if_fail(server != NULL);
if (addr == NULL || g_strcasecmp(nick, server->nick) == 0)
if (addr == NULL || g_ascii_strcasecmp(nick, server->nick) == 0)
return;
params = event_get_params(data, 2, &target, &text);
@ -265,7 +265,7 @@ static void flood_notice(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
g_return_if_fail(server != NULL);
if (addr == NULL || g_strcasecmp(nick, server->nick) == 0)
if (addr == NULL || g_ascii_strcasecmp(nick, server->nick) == 0)
return;
params = event_get_params(data, 2, &target, &text);
@ -283,7 +283,7 @@ static void flood_ctcp(IRC_SERVER_REC *server, const char *data,
g_return_if_fail(data != NULL);
g_return_if_fail(server != NULL);
if (addr == NULL || g_strcasecmp(nick, server->nick) == 0)
if (addr == NULL || g_ascii_strcasecmp(nick, server->nick) == 0)
return;
level = g_ascii_strncasecmp(data, "ACTION ", 7) != 0 ? MSGLEVEL_CTCPS :

2
src/irc/notifylist/notify-ison.c
View file

@ -69,7 +69,7 @@ NOTIFY_NICK_REC *notify_nick_find(IRC_SERVER_REC *server, const char *nick)
for (tmp = mserver->notify_users; tmp != NULL; tmp = tmp->next) {
rec = tmp->data;
if (g_strcasecmp(rec->nick, nick) == 0)
if (g_ascii_strcasecmp(rec->nick, nick) == 0)
return rec;
}

4
src/irc/notifylist/notifylist.c
View file

@ -94,7 +94,7 @@ int notifylist_ircnets_match(NOTIFYLIST_REC *rec, const char *ircnet)
if (strcmp(ircnet, "*") == 0) return TRUE;
for (tmp = rec->ircnets; *tmp != NULL; tmp++) {
if (g_strcasecmp(*tmp, ircnet) == 0)
if (g_ascii_strcasecmp(*tmp, ircnet) == 0)
return TRUE;
}
@ -113,7 +113,7 @@ NOTIFYLIST_REC *notifylist_find(const char *mask, const char *ircnet)
NOTIFYLIST_REC *rec = tmp->data;
/* check mask */
if (g_strncasecmp(rec->mask, mask, len) != 0 ||
if (g_ascii_strncasecmp(rec->mask, mask, len) != 0 ||
(rec->mask[len] != '\0' && rec->mask[len] != '!')) continue;
/* check ircnet */

12
src/irc/proxy/listen.c
View file

@ -152,8 +152,8 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
params = event_get_params(args, 2, &origin, &target);
if (*target == '\0' ||
g_strcasecmp(target, client->proxy_address) == 0 ||
g_strcasecmp(target, client->nick) == 0) {
g_ascii_strcasecmp(target, client->proxy_address) == 0 ||
g_ascii_strcasecmp(target, client->nick) == 0) {
proxy_outdata(client, ":%s PONG %s :%s\n",
client->proxy_address,
client->proxy_address, origin);
@ -169,7 +169,7 @@ static void handle_client_cmd(CLIENT_REC *client, char *cmd, char *args,
client->want_ctcp = 1;
for (tmp = proxy_clients; tmp != NULL; tmp = tmp->next) {
CLIENT_REC *rec = tmp->data;
if ((g_strcasecmp(client->listen->ircnet,rec->listen->ircnet) == 0) &&
if ((g_ascii_strcasecmp(client->listen->ircnet,rec->listen->ircnet) == 0) &&
/* kludgy way to check if the clients aren't the same */
(client->recv_tag != rec->recv_tag)) {
if (rec->want_ctcp == 1)
@ -463,7 +463,7 @@ static void event_connected(IRC_SERVER_REC *server)
if (rec->connected && rec->server == NULL &&
(strcmp(rec->listen->ircnet, "*") == 0 ||
(chatnet != NULL &&
g_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
g_ascii_strcasecmp(chatnet, rec->listen->ircnet) == 0))) {
proxy_outdata(rec, ":%s NOTICE %s :Connected to server\n",
rec->proxy_address, rec->nick);
rec->server = server;
@ -514,7 +514,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
if (!IS_IRC_SERVER(server))
return;
if (g_strcasecmp(orignick, server->nick) != 0)
if (g_ascii_strcasecmp(orignick, server->nick) != 0)
return;
if (*data == ':') data++;
@ -566,7 +566,7 @@ static LISTEN_REC *find_listen(const char *ircnet, int port)
LISTEN_REC *rec = tmp->data;
if (rec->port == port &&
g_strcasecmp(rec->ircnet, ircnet) == 0)
g_ascii_strcasecmp(rec->ircnet, ircnet) == 0)
return rec;
}