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

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

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);

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;

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! */

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;
}

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)

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;