diff options
author | AndersBroman <anders.broman@ericsson.com> | 2017-03-02 16:17:56 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-03-02 15:20:05 +0000 |
commit | 2f6ba7534721d643fca84bfce80712daa4fffa3d (patch) | |
tree | 348f08b993f5d286378669a7e897e090b38435e8 /filter_files.c | |
parent | bf28bd4da3c163234dbdccf492601853b697073d (diff) |
Use glib-compat
Change-Id: I510af18d433c4db360243dda72260e59eb84355f
Reviewed-on: https://code.wireshark.org/review/20336
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'filter_files.c')
-rw-r--r-- | filter_files.c | 53 |
1 files changed, 17 insertions, 36 deletions
diff --git a/filter_files.c b/filter_files.c index d518ff49bf..c5e8818194 100644 --- a/filter_files.c +++ b/filter_files.c @@ -30,6 +30,7 @@ #include <wsutil/file_util.h> #include <wsutil/filesystem.h> +#include <wsutil/glib-compat.h> #include "filter_files.h" @@ -101,42 +102,22 @@ free_filter_entry(gpointer data) void free_filter_lists(void) { - if (capture_filters) { -#if GLIB_CHECK_VERSION(2, 28, 0) - g_list_free_full(capture_filters, free_filter_entry); -#else - g_list_foreach(capture_filters, (GFunc)free_filter_entry, NULL); - g_list_free(capture_filters); -#endif - capture_filters = NULL; - } - if (display_filters) { -#if GLIB_CHECK_VERSION(2, 28, 0) - g_list_free_full(display_filters, free_filter_entry); -#else - g_list_foreach(display_filters, (GFunc)free_filter_entry, NULL); - g_list_free(display_filters); -#endif - display_filters = NULL; - } - if (capture_edited_filters) { -#if GLIB_CHECK_VERSION(2, 28, 0) - g_list_free_full(capture_edited_filters, free_filter_entry); -#else - g_list_foreach(capture_edited_filters, (GFunc)free_filter_entry, NULL); - g_list_free(capture_edited_filters); -#endif - capture_edited_filters = NULL; - } - if (display_edited_filters) { -#if GLIB_CHECK_VERSION(2, 28, 0) - g_list_free_full(display_edited_filters, free_filter_entry); -#else - g_list_foreach(display_edited_filters, (GFunc)free_filter_entry, NULL); - g_list_free(display_edited_filters); -#endif - display_edited_filters = NULL; - } + if (capture_filters) { + g_list_free_full(capture_filters, free_filter_entry); + capture_filters = NULL; + } + if (display_filters) { + g_list_free_full(display_filters, free_filter_entry); + display_filters = NULL; + } + if (capture_edited_filters) { + g_list_free_full(capture_edited_filters, free_filter_entry); + capture_edited_filters = NULL; + } + if (display_edited_filters) { + g_list_free_full(display_edited_filters, free_filter_entry); + display_edited_filters = NULL; + } } static GList * |