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

correct wrong function prefixes: gslist -> i_slist

Browse source
This commit is contained in:
Ailin Nemui 2021-01-05 21:35:18 +01:00
commit b5ddc55fe6
17 changed files with 47 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/irc/core/irc-cap.c
View file

@ -31,19 +31,18 @@ int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
/* If the negotiation hasn't been completed yet just queue the requests */
if (!server->cap_complete) {
if (enable && !gslist_find_string(server->cap_queue, cap)) {
if (enable && !i_slist_find_string(server->cap_queue, cap)) {
server->cap_queue = g_slist_prepend(server->cap_queue, g_strdup(cap));
return TRUE;
}
else if (!enable && gslist_find_string(server->cap_queue, cap)) {
server->cap_queue = gslist_delete_string(server->cap_queue, cap, g_free);
} else if (!enable && i_slist_find_string(server->cap_queue, cap)) {
server->cap_queue = i_slist_delete_string(server->cap_queue, cap, g_free);
return TRUE;
}
return FALSE;
}
if (enable && !gslist_find_string(server->cap_active, cap)) {
if (enable && !i_slist_find_string(server->cap_active, cap)) {
/* Make sure the required cap is supported by the server */
if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL))
return FALSE;
@ -51,8 +50,7 @@ int irc_cap_toggle (IRC_SERVER_REC *server, char *cap, int enable)
signal_emit("server cap req", 2, server, cap);
irc_send_cmdv(server, "CAP REQ %s", cap);
return TRUE;
}
else if (!enable && gslist_find_string(server->cap_active, cap)) {
} else if (!enable && i_slist_find_string(server->cap_active, cap)) {
char *negcap = g_strdup_printf("-%s", cap);
signal_emit("server cap req", 2, server, negcap);
@ -200,7 +198,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
}
/* Clear the queue here */
gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
server->cap_queue = NULL;
/* If the server doesn't support any cap we requested close the negotiation here */
@ -223,8 +221,9 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
disable = (*caps[i] == '-');
if (disable)
server->cap_active = gslist_delete_string(server->cap_active, caps[i] + 1, g_free);
else if (!gslist_find_string(server->cap_active, caps[i]))
server->cap_active =
i_slist_delete_string(server->cap_active, caps[i] + 1, g_free);
else if (!i_slist_find_string(server->cap_active, caps[i]))
server->cap_active = g_slist_prepend(server->cap_active, g_strdup(caps[i]));
if (!strcmp(caps[i], "sasl"))
@ -273,7 +272,7 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add
cap_emit_signal(server, "delete", key);
/* The server removed this CAP, remove it from the list
* of the active ones if we had requested it */
server->cap_active = gslist_delete_string(server->cap_active, key, g_free);
server->cap_active = i_slist_delete_string(server->cap_active, key, g_free);
/* We don't transfer the ownership of those two
* variables this time, just free them when we're done. */
g_free(key);

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

@ -443,7 +443,7 @@ static void sig_destroyed(IRC_SERVER_REC *server)
g_slist_free(server->cmdqueue);
server->cmdqueue = NULL;
gslist_free_full(server->cap_active, (GDestroyNotify) g_free);
i_slist_free_full(server->cap_active, (GDestroyNotify) g_free);
server->cap_active = NULL;
if (server->cap_supported) {
@ -451,7 +451,7 @@ static void sig_destroyed(IRC_SERVER_REC *server)
server->cap_supported = NULL;
}
gslist_free_full(server->cap_queue, (GDestroyNotify) g_free);
i_slist_free_full(server->cap_queue, (GDestroyNotify) g_free);
server->cap_queue = NULL;
/* was g_free_and_null, but can't use on a GString */

2
src/irc/core/servers-redirect.c
View file

@ -219,7 +219,7 @@ static char *signal_list_move(GSList **signals, const char *event)
GSList *link;
char *linkevent, *linksignal;
link = gslist_find_string(*signals, event);
link = i_slist_find_string(*signals, event);
if (link == NULL)
return NULL;

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

@ -55,7 +55,7 @@ void dcc_unregister_type(const char *type)
{
GSList *pos;
pos = gslist_find_string(dcc_types, type);
pos = i_slist_find_string(dcc_types, type);
if (pos != NULL) {
void *tmp = pos->data;
dcc_types = g_slist_remove(dcc_types, pos->data);
@ -65,7 +65,7 @@ void dcc_unregister_type(const char *type)
int dcc_str2type(const char *str)
{
if (gslist_find_string(dcc_types, str) == NULL)
if (i_slist_find_string(dcc_types, str) == NULL)
return -1;
return module_get_uniq_id_str("DCC", str);

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

@ -279,7 +279,7 @@ static void ison_check_parts(IRC_SERVER_REC *server)
NOTIFY_NICK_REC *rec = tmp->data;
next = tmp->next;
if (gslist_find_icase_string(mserver->ison_tempusers, rec->nick) != NULL)
if (i_slist_find_icase_string(mserver->ison_tempusers, rec->nick) != NULL)
continue;
notifylist_left(server, rec);