From 3f5003af92d2b2b0e4f5565ccd90b29e32e6b30b Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 16 Jan 2020 10:53:47 +0100 Subject: [PATCH] Stop using parse_list It will be gone from libreport before you know it. --- src/daemon/abrt-action-save-package-data.c | 12 ++++++------ src/plugins/abrt-dump-journal-xorg.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c index e52b3d55..30e8fd73 100644 --- a/src/daemon/abrt-action-save-package-data.c +++ b/src/daemon/abrt-action-save-package-data.c @@ -49,20 +49,20 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) value = get_map_string_item_or_NULL(settings, "BlackList"); if (value) { - settings_setBlackListedPkgs = parse_list(value); + settings_setBlackListedPkgs = parse_delimited_list(value, ","); remove_map_string_item(settings, "BlackList"); } else - settings_setBlackListedPkgs = parse_list(DEFAULT_BLACKLISTED_PKGS); + settings_setBlackListedPkgs = parse_delimited_list(DEFAULT_BLACKLISTED_PKGS, ","); value = get_map_string_item_or_NULL(settings, "BlackListedPaths"); if (value) { - settings_setBlackListedPaths = parse_list(value); + settings_setBlackListedPaths = parse_delimited_list(value, ","); remove_map_string_item(settings, "BlackListedPaths"); } else - settings_setBlackListedPaths = parse_list(DEFAULT_BLACKLISTED_PATHS); + settings_setBlackListedPaths = parse_delimited_list(DEFAULT_BLACKLISTED_PATHS, ","); value = get_map_string_item_or_NULL(settings, "ProcessUnpackaged"); if (value) @@ -74,11 +74,11 @@ static void ParseCommon(map_string_t *settings, const char *conf_filename) value = get_map_string_item_or_NULL(settings, "Interpreters"); if (value) { - settings_Interpreters = parse_list(value); + settings_Interpreters = parse_delimited_list(value, ","); remove_map_string_item(settings, "Interpreters"); } else - settings_Interpreters = parse_list(DEFAULT_INTERPRETERS); + settings_Interpreters = parse_delimited_list(DEFAULT_INTERPRETERS, ","); map_string_iter_t iter; const char *name; diff --git a/src/plugins/abrt-dump-journal-xorg.c b/src/plugins/abrt-dump-journal-xorg.c index 92d19661..351bbae4 100644 --- a/src/plugins/abrt-dump-journal-xorg.c +++ b/src/plugins/abrt-dump-journal-xorg.c @@ -261,7 +261,7 @@ int main(int argc, char *argv[]) conf_journal_filters = XORG_DEFAULT_JOURNAL_FILTERS; } - xorg_journal_filter = parse_list(conf_journal_filters); + xorg_journal_filter = parse_delimited_list(conf_journal_filters, ","); /* list data will be free by g_list_free_full */ free_filter_list_data = true; free_map_string(settings); -- 2.25.0