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

10
src/core/channels.c
View file

@ -126,9 +126,8 @@ CHANNEL_REC *channel_find(SERVER_REC *server, const char *name)
return channel_find_server(server, name);
/* find from any server */
return gslist_foreach_find(servers,
(FOREACH_FIND_FUNC) channel_find_server,
(void *) name);
return i_slist_foreach_find(servers, (FOREACH_FIND_FUNC) channel_find_server,
(void *) name);
}
void channel_change_name(CHANNEL_REC *channel, const char *name)
@ -153,9 +152,8 @@ void channel_change_visible_name(CHANNEL_REC *channel, const char *name)
static CHANNEL_REC *channel_find_servers(GSList *servers, const char *name)
{
return gslist_foreach_find(servers,
(FOREACH_FIND_FUNC) channel_find_server,
(void *) name);
return i_slist_foreach_find(servers, (FOREACH_FIND_FUNC) channel_find_server,
(void *) name);
}
static GSList *servers_find_chatnet_except(SERVER_REC *server)

7
src/core/commands.c
View file

@ -431,7 +431,7 @@ static void command_calc_options(COMMAND_REC *rec, const char *options)
g_strfreev(optlist);
/* linked list -> string[] */
str = gslist_to_string(list, " ");
str = i_slist_to_string(list, " ");
rec->options = g_strsplit(str, " ", -1);
g_free(str);
@ -831,7 +831,7 @@ void commands_remove_module(const char *module)
COMMAND_REC *rec = tmp->data;
next = tmp->next;
modlist = gslist_find_string(rec->modules, module);
modlist = i_slist_find_string(rec->modules, module);
if (modlist != NULL)
command_module_unbind_all(rec, modlist->data);
}
@ -865,8 +865,7 @@ static int cmd_protocol_match(COMMAND_REC *cmd, SERVER_REC *server)
#define alias_runstack_pop(alias) \
alias_runstack = g_slist_remove(alias_runstack, alias)
#define alias_runstack_find(alias) \
(gslist_find_icase_string(alias_runstack, alias) != NULL)
#define alias_runstack_find(alias) (i_slist_find_icase_string(alias_runstack, alias) != NULL)
static void parse_command(const char *command, int expand_aliases,
SERVER_REC *server, void *item)

2
src/core/log.c
View file

@ -561,7 +561,7 @@ static void log_read_config(void)
if (node != NULL)
log_items_read_config(node, log);
if (log->autoopen || gslist_find_string(fnames, log->fname))
if (log->autoopen || i_slist_find_string(fnames, log->fname))
log_start_logging(log);
}

14
src/core/misc.c
View file

@ -167,7 +167,7 @@ int strarray_find(char **array, const char *item)
return -1;
}
GSList *gslist_find_string(GSList *list, const char *key)
GSList *i_slist_find_string(GSList *list, const char *key)
{
for (; list != NULL; list = list->next)
if (g_strcmp0(list->data, key) == 0) return list;
@ -175,7 +175,7 @@ GSList *gslist_find_string(GSList *list, const char *key)
return NULL;
}
GSList *gslist_find_icase_string(GSList *list, const char *key)
GSList *i_slist_find_icase_string(GSList *list, const char *key)
{
for (; list != NULL; list = list->next)
if (g_ascii_strcasecmp(list->data, key) == 0) return list;
@ -183,7 +183,7 @@ GSList *gslist_find_icase_string(GSList *list, const char *key)
return NULL;
}
void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data)
void *i_slist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data)
{
void *ret;
@ -197,7 +197,7 @@ void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data
return NULL;
}
void gslist_free_full (GSList *list, GDestroyNotify free_func)
void i_slist_free_full(GSList *list, GDestroyNotify free_func)
{
GSList *tmp;
@ -210,7 +210,7 @@ void gslist_free_full (GSList *list, GDestroyNotify free_func)
g_slist_free(list);
}
GSList *gslist_remove_string (GSList *list, const char *str)
GSList *i_slist_remove_string(GSList *list, const char *str)
{
GSList *l;
@ -221,7 +221,7 @@ GSList *gslist_remove_string (GSList *list, const char *str)
return list;
}
GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func)
GSList *i_slist_delete_string(GSList *list, const char *str, GDestroyNotify free_func)
{
GSList *l;
@ -255,7 +255,7 @@ char *gslistptr_to_string(GSList *list, int offset, const char *delimiter)
}
/* `list' contains char* */
char *gslist_to_string(GSList *list, const char *delimiter)
char *i_slist_to_string(GSList *list, const char *delimiter)
{
GString *str;
char *ret;

14
src/core/misc.h
View file

@ -19,21 +19,21 @@ int g_timeval_cmp(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
long get_timeval_diff(const GTimeVal *tv1, const GTimeVal *tv2) G_GNUC_DEPRECATED;
#pragma GCC diagnostic pop
GSList *gslist_find_string(GSList *list, const char *key);
GSList *gslist_find_icase_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);
GList *glist_find_string(GList *list, const char *key);
GList *glist_find_icase_string(GList *list, const char *key);
GSList *gslist_remove_string (GSList *list, const char *str) G_GNUC_DEPRECATED;
GSList *gslist_delete_string (GSList *list, const char *str, GDestroyNotify free_func);
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);
void gslist_free_full (GSList *list, GDestroyNotify free_func);
void i_slist_free_full(GSList *list, GDestroyNotify free_func);
void *gslist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data);
void *i_slist_foreach_find(GSList *list, FOREACH_FIND_FUNC func, const void *data);
/* `list' contains pointer to structure with a char* to string. */
char *gslistptr_to_string(GSList *list, int offset, const char *delimiter);
/* `list' contains char* */
char *gslist_to_string(GSList *list, const char *delimiter);
char *i_slist_to_string(GSList *list, const char *delimiter);
GList *optlist_remove_known(const char *cmd, GHashTable *optlist);

5
src/core/settings.c
View file

@ -613,9 +613,8 @@ void settings_check_module(const char *module)
}
}
if (count > 0) {
if (gslist_find_icase_string(last_invalid_modules,
module) == NULL) {
/* mark this module having invalid settings */
if (i_slist_find_icase_string(last_invalid_modules, module) == NULL) {
/* mark this module having invalid settings */
last_invalid_modules =
g_slist_append(last_invalid_modules,
g_strdup(module));