diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2016-06-14 12:35:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 12:35:30 +0200 |
| commit | fd371cc345aeb0254750c801f6570b5208974ce4 (patch) | |
| tree | afb86510f573f59f20e2ee849e92b66bd3dd013b /src/fe-common | |
| parent | 700a0d52a57265d9adc8195198fcdf6822c38414 (diff) | |
| parent | 9fd286fed8d231f9c78353f5d746ed82e3bc05c4 (diff) | |
| download | irssi-fd371cc345aeb0254750c801f6570b5208974ce4.zip | |
Merge pull request #422 from LemonBoy/misc-cleanup
Clean up misc.c
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/fe-exec.c | 15 | ||||
| -rw-r--r-- | src/fe-common/core/fe-log.c | 2 | ||||
| -rw-r--r-- | src/fe-common/core/hilight-text.c | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c index b5f289ce..36990866 100644 --- a/src/fe-common/core/fe-exec.c +++ b/src/fe-common/core/fe-exec.c @@ -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; } diff --git a/src/fe-common/core/fe-log.c b/src/fe-common/core/fe-log.c index f2c4c014..5bc5c4e1 100644 --- a/src/fe-common/core/fe-log.c +++ b/src/fe-common/core/fe-log.c @@ -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; diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c index 36e1e78c..4691a708 100644 --- a/src/fe-common/core/hilight-text.c +++ b/src/fe-common/core/hilight-text.c @@ -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 */ |