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

Merge pull request #422 from LemonBoy/misc-cleanup

Browse source 
Clean up misc.c
This commit is contained in:
ailin-nemui 2016-06-14 12:35:30 +02:00 • committed by GitHub
commit fd371cc345
20 changed files with 63 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/fe-common/core/fe-exec.c
View file

@ -237,22 +237,13 @@ static int signal_name_to_id(const char *name)
static int cmd_options_get_signal(const char *cmd,
GHashTable *optlist)
{
GSList *list, *tmp, *next;
GList *list;
char *signame;
int signum;
/* get all the options, then remove the known ones. there should
be only one left - the signal */
list = hashtable_get_keys(optlist);
if (cmd != NULL) {
for (tmp = list; tmp != NULL; tmp = next) {
char *option = tmp->data;
next = tmp->next;
if (command_have_option(cmd, option))
list = g_slist_remove(list, option);
}
}
list = optlist_remove_known(cmd, optlist);
if (list == NULL)
return -1;
@ -272,7 +263,7 @@ static int cmd_options_get_signal(const char *cmd,
return -2;
}
g_slist_free(list);
g_list_free(list);
return signum;
}

2
src/fe-common/core/fe-log.c
View file

@ -453,7 +453,7 @@ static void autolog_open(SERVER_REC *server, const char *server_tag,
log_item_add(log, LOG_ITEM_TARGET, target, server_tag);
dir = g_path_get_dirname(log->real_fname);
mkpath(dir, log_dir_create_mode);
g_mkdir_with_parents(dir, log_dir_create_mode);
g_free(dir);
log->temp = TRUE;

2
src/fe-common/core/hilight-text.c
View file

@ -178,7 +178,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
if (channels == NULL || rec->channels == NULL)
continue; /* other doesn't have channels */
if (strarray_length(channels) != strarray_length(rec->channels))
if (g_strv_length(channels) != g_strv_length(rec->channels))
continue; /* different amount of channels */
/* check that channels match */