diff options
| -rw-r--r-- | ui/filter_files.c | 67 | ||||
| -rw-r--r-- | ui/filter_files.h | 9 |
2 files changed, 1 insertions, 75 deletions
diff --git a/ui/filter_files.c b/ui/filter_files.c index 560ff8866a..b289175a4e 100644 --- a/ui/filter_files.c +++ b/ui/filter_files.c @@ -33,16 +33,6 @@ static GList *capture_filters = NULL; static GList *display_filters = NULL; /* - * List of capture filters - currently edited. - */ -static GList *capture_edited_filters = NULL; - -/* - * List of display filters - currently edited. - */ -static GList *display_edited_filters = NULL; - -/* * Read in a list of filters. * * On error, report the error via the UI. @@ -80,14 +70,6 @@ void free_filter_lists(void) 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 * @@ -378,19 +360,6 @@ read_filter_list(filter_list_type_t list_type) fclose(ff); g_free(filt_name); g_free(filt_expr); - - /* init the corresponding edited list */ - switch (list_type) { - case CFILTER_LIST: - copy_filter_list(CFILTER_EDITED_LIST, CFILTER_LIST); - break; - case DFILTER_LIST: - copy_filter_list(DFILTER_EDITED_LIST, DFILTER_LIST); - break; - default: - g_assert_not_reached(); - return; - } } /* @@ -411,14 +380,6 @@ get_filter_list(filter_list_type_t list_type) flpp = &display_filters; break; - case CFILTER_EDITED_LIST: - flpp = &capture_edited_filters; - break; - - case DFILTER_EDITED_LIST: - flpp = &display_edited_filters; - break; - default: g_assert_not_reached(); flpp = NULL; @@ -603,34 +564,6 @@ save_filter_list(filter_list_type_t list_type) } /* - * Copy a filter list into another. - */ -void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type) -{ - GList **flpp_dest; - GList **flpp_src; - GList *flp_src; - filter_def *filt; - - g_assert(dest_type != src_type); - - flpp_dest = get_filter_list(dest_type); - flpp_src = get_filter_list(src_type); - /* throw away the "old" destination list - a NULL list is ok here */ - while(*flpp_dest) { - *flpp_dest = remove_filter_entry(*flpp_dest, g_list_first(*flpp_dest)); - } - g_assert(g_list_length(*flpp_dest) == 0); - - /* copy the list entries */ - for(flp_src = g_list_first(*flpp_src); flp_src; flp_src = g_list_next(flp_src)) { - filt = (filter_def *)(flp_src->data); - - *flpp_dest = add_filter_entry(*flpp_dest, filt->name, filt->strval); - } -} - -/* * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local Variables: diff --git a/ui/filter_files.h b/ui/filter_files.h index f5371a098e..6b8c0cb906 100644 --- a/ui/filter_files.h +++ b/ui/filter_files.h @@ -35,9 +35,7 @@ extern "C" { */ typedef enum { CFILTER_LIST, /* capture filter list - saved */ - DFILTER_LIST, /* display filter list - saved */ - CFILTER_EDITED_LIST, /* capture filter list - currently edited. GTK+ only. */ - DFILTER_EDITED_LIST /* display filter list - currently edited. GTK+ only. */ + DFILTER_LIST /* display filter list - saved */ } filter_list_type_t; /* @@ -80,11 +78,6 @@ void remove_from_filter_list(filter_list_type_t list, GList *fl_entry); void save_filter_list(filter_list_type_t list_type); /* - * Clone the filter list so it can be edited. GTK+ only. - */ -void copy_filter_list(filter_list_type_t dest_type, filter_list_type_t src_type); - -/* * Free all filter lists */ void free_filter_lists(void); |