diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-20 13:44:27 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-20 23:16:54 +0000 |
| commit | ead79e6aa15210cf83032698d7d17eb54a3d0857 (patch) | |
| tree | 99484c25885f5c277f8cb4b2a54d7fac2534b51a /epan/filter_expressions.c | |
| parent | 422ad100aad4c076ab05f1373dad59481ea12072 (diff) | |
| download | wireshark-ead79e6aa15210cf83032698d7d17eb54a3d0857.tar.gz | |
Clear the filter expression list in prefs.c.
Move filter_expression_nuke from ui/gtk to epan and rename it to
filter_expression_free. Call it in prefs_reset along with the other
preference reset routines.
This keeps the Qt filter toolbar from filling up with duplicate
expressions when the profile changes.
Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b
Reviewed-on: https://code.wireshark.org/review/7281
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/filter_expressions.c')
| -rw-r--r-- | epan/filter_expressions.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c index 9d03213107..936fca96c7 100644 --- a/epan/filter_expressions.c +++ b/epan/filter_expressions.c @@ -76,6 +76,18 @@ filter_expression_init(gboolean enable_prefs) prefs.filter_expressions = pfilter_expression_head; } +void +filter_expression_free(struct filter_expression *list_head) +{ + if (list_head == NULL) + return; + filter_expression_free(list_head->next); + g_free(list_head->label); + g_free(list_head->expression); +} + + + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |