aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Merge pull request #1264 from ailin-nemui/wrong-prefixes

Browse Source 
correct two more wrong prefixes

    [M] 'function GList* i_list_find_icase_string(GList*, const char*)'    {glist_find_icase_string}
    [M] 'function GList* i_list_find_string(GList*, const char*)'    {glist_find_string}
This commit is contained in:
ailin-nemui 2021-01-30 23:33:19 +01:00 committed by GitHub
commit c108cae02f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/misc.c
View File

@ -293,7 +293,7 @@ GList *optlist_remove_known(const char *cmd, GHashTable *optlist)
return list; return list;
} }
GList *glist_find_string(GList *list, const char *key) GList *i_list_find_string(GList *list, const char *key)
{ {
for (; list != NULL; list = list->next) for (; list != NULL; list = list->next)
if (g_strcmp0(list->data, key) == 0) return list; if (g_strcmp0(list->data, key) == 0) return list;
@ -301,7 +301,7 @@ GList *glist_find_string(GList *list, const char *key)
return NULL; return NULL;
} }
GList *glist_find_icase_string(GList *list, const char *key) GList *i_list_find_icase_string(GList *list, const char *key)
{ {
for (; list != NULL; list = list->next) for (; list != NULL; list = list->next)
if (g_ascii_strcasecmp(list->data, key) == 0) return list; if (g_ascii_strcasecmp(list->data, key) == 0) return list;

4
src/core/misc.h
View File

@ -21,8 +21,8 @@ long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATE
GSList *i_slist_find_string(GSList *list, const char *key); GSList *i_slist_find_string(GSList *list, const char *key);
GSList *i_slist_find_icase_string(GSList *list, const char *key); GSList *i_slist_find_icase_string(GSList *list, const char *key);
GList *glist_find_string(GList *list, const char *key); GList *i_list_find_string(GList *list, const char *key);
GList *glist_find_icase_string(GList *list, const char *key); GList *i_list_find_icase_string(GList *list, const char *key);
GSList *i_slist_remove_string(GSList *list, const char *str) G_GNUC_DEPRECATED; GSList *i_slist_remove_string(GSList *list, const char *str) G_GNUC_DEPRECATED;
GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func); GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func);

16
src/fe-common/core/chat-completion.c
View File

@ -374,10 +374,10 @@ static void complete_from_nicklist(GList **outlist, CHANNEL_REC *channel,
for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) { for (tmp = mchannel->lastmsgs; tmp != NULL; tmp = tmp->next) {
LAST_MSG_REC *rec = tmp->data; LAST_MSG_REC *rec = tmp->data;
if ((match_case? strncmp(rec->nick, nick, len) if ((match_case ? strncmp(rec->nick, nick, len) :
: g_ascii_strncasecmp(rec->nick, nick, len)) == 0 && g_ascii_strncasecmp(rec->nick, nick, len)) == 0 &&
(match_case? glist_find_string(*outlist, rec->nick) (match_case ? i_list_find_string(*outlist, rec->nick) :
: glist_find_icase_string(*outlist, rec->nick)) == NULL) { i_list_find_icase_string(*outlist, rec->nick)) == NULL) {
str = g_strconcat(rec->nick, suffix, NULL); str = g_strconcat(rec->nick, suffix, NULL);
if (completion_lowercase) ascii_strdown(str); if (completion_lowercase) ascii_strdown(str);
if (rec->own) if (rec->own)
@ -435,7 +435,7 @@ static GList *completion_nicks_nonstrict(CHANNEL_REC *channel,
if (completion_lowercase) if (completion_lowercase)
ascii_strdown(tnick); ascii_strdown(tnick);
if (glist_find_icase_string(list, tnick) == NULL) if (i_list_find_icase_string(list, tnick) == NULL)
list = g_list_append(list, tnick); list = g_list_append(list, tnick);
else else
g_free(tnick); g_free(tnick);
@ -482,7 +482,7 @@ static GList *completion_channel_nicks(CHANNEL_REC *channel, const char *nick,
str = g_strconcat(rec->nick, suffix, NULL); str = g_strconcat(rec->nick, suffix, NULL);
if (completion_lowercase) if (completion_lowercase)
ascii_strdown(str); ascii_strdown(str);
if (glist_find_icase_string(list, str) == NULL) if (i_list_find_icase_string(list, str) == NULL)
list = g_list_append(list, str); list = g_list_append(list, str);
else else
g_free(str); g_free(str);
@ -505,7 +505,7 @@ static GList *completion_joinlist(GList *list1, GList *list2)
old = list2; old = list2;
while (list2 != NULL) { while (list2 != NULL) {
if (!glist_find_icase_string(list1, list2->data)) if (!i_list_find_icase_string(list1, list2->data))
list1 = g_list_append(list1, list2->data); list1 = g_list_append(list1, list2->data);
else else
g_free(list2->data); g_free(list2->data);
@ -570,7 +570,7 @@ GList *completion_get_channels(SERVER_REC *server, const char *word)
CHANNEL_SETUP_REC *rec = tmp->data; CHANNEL_SETUP_REC *rec = tmp->data;
if (g_ascii_strncasecmp(rec->name, word, len) == 0 && if (g_ascii_strncasecmp(rec->name, word, len) == 0 &&
glist_find_icase_string(list, rec->name) == NULL) i_list_find_icase_string(list, rec->name) == NULL)
list = g_list_append(list, g_strdup(rec->name)); list = g_list_append(list, g_strdup(rec->name));
} }

4
src/fe-common/core/completion.c
View File

@ -460,7 +460,7 @@ static GList *completion_get_aliases(const char *alias, char cmdchar)
/* add matching alias to completion list, aliases will /* add matching alias to completion list, aliases will
be appended after command completions and kept in be appended after command completions and kept in
uppercase to show it's an alias */ uppercase to show it's an alias */
if (glist_find_icase_string(complist, word) == NULL) if (i_list_find_icase_string(complist, word) == NULL)
complist = complist =
g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp); g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
else else
@ -490,7 +490,7 @@ static GList *completion_get_commands(const char *cmd, char cmdchar)
if (g_ascii_strncasecmp(rec->cmd, cmd, len) == 0) { if (g_ascii_strncasecmp(rec->cmd, cmd, len) == 0) {
word = cmdchar == '\0' ? g_strdup(rec->cmd) : word = cmdchar == '\0' ? g_strdup(rec->cmd) :
g_strdup_printf("%c%s", cmdchar, rec->cmd); g_strdup_printf("%c%s", cmdchar, rec->cmd);
if (glist_find_icase_string(complist, word) == NULL) if (i_list_find_icase_string(complist, word) == NULL)
complist = complist =
g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp); g_list_insert_sorted(complist, word, (GCompareFunc) i_istr_cmp);
else else