diff options
Diffstat (limited to 'epan/filter_expressions.h')
| -rw-r--r-- | epan/filter_expressions.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h index a5042fff09..a9af58860a 100644 --- a/epan/filter_expressions.h +++ b/epan/filter_expressions.h @@ -25,6 +25,9 @@ #include "ws_symbol_export.h" +#include <epan/prefs.h> +#include <epan/wmem/wmem.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -33,19 +36,15 @@ extern "C" { * Filter expressions. */ -struct filter_expression { - gpointer button; /* Filter toolbar */ +typedef struct filter_expression { + gpointer button; /* Filter toolbar (GTK only) */ gchar *label; gchar *expression; - gint filter_index; gboolean enabled; /* Can be set to FALSE by Preferences Dialog */ - gboolean deleted; /* Can be set to TRUE by Preferences Dialog (GTK+ only) */ - - struct filter_expression *next; -}; +} filter_expression_t; -WS_DLL_PUBLIC struct filter_expression **pfilter_expression_head; +WS_DLL_PUBLIC void filter_expression_iterate_expressions(wmem_foreach_func func, void* user_data); /** Create a filter expression * @@ -55,16 +54,11 @@ WS_DLL_PUBLIC struct filter_expression **pfilter_expression_head; * @return A newly allocated and initialized struct filter_expression. */ WS_DLL_PUBLIC -struct filter_expression *filter_expression_new(const gchar *label, +filter_expression_t *filter_expression_new(const gchar *label, const gchar *expr, const gboolean enabled); -void filter_expression_init(void); - -/** Clear the filter expression list. - * Frees each item in the list. Caller should set list_head to NULL afterward. - */ -WS_DLL_PUBLIC -void filter_expression_free(struct filter_expression *list_head); +/* Keep the UAT structure local to the filter_expressions */ +void filter_expression_register_uat(module_t* pref_module); #ifdef __cplusplus } |