diff options
| author | Anders <anders.broman@ericsson.com> | 2018-04-17 12:48:35 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-17 15:01:24 +0000 |
| commit | 25a337cdb060962606c5caf7d918c2ed0aedf6e2 (patch) | |
| tree | 49765468d8a9fee3a0c2faa79421a132677660bf /epan/dfilter | |
| parent | 3dab804250ad4c648438fb23a107d74b51f4480f (diff) | |
glib: Use g_slist_free_full() in a couple of places.
Change-Id: Iff833bf5c197959c8decb62d6ce794c6d0415fb7
Reviewed-on: https://code.wireshark.org/review/26978
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/sttype-function.c | 5 | ||||
| -rw-r--r-- | epan/dfilter/sttype-set.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c index 3d58543c3a..73478b28ef 100644 --- a/epan/dfilter/sttype-function.c +++ b/epan/dfilter/sttype-function.c @@ -52,7 +52,7 @@ function_dup(gconstpointer data) } static void -slist_stnode_free(gpointer data, gpointer user_data _U_) +slist_stnode_free(gpointer data) { stnode_free((stnode_t *)data); } @@ -60,8 +60,7 @@ slist_stnode_free(gpointer data, gpointer user_data _U_) void st_funcparams_free(GSList *params) { - g_slist_foreach(params, slist_stnode_free, NULL); - g_slist_free(params); + g_slist_free_full(params, slist_stnode_free); } static void diff --git a/epan/dfilter/sttype-set.c b/epan/dfilter/sttype-set.c index 8f460f49a1..8b4634a2c3 100644 --- a/epan/dfilter/sttype-set.c +++ b/epan/dfilter/sttype-set.c @@ -12,7 +12,7 @@ #include "sttype-set.h" static void -slist_stnode_free(gpointer data, gpointer user_data _U_) +slist_stnode_free(gpointer data) { stnode_free((stnode_t *)data); } @@ -20,8 +20,7 @@ slist_stnode_free(gpointer data, gpointer user_data _U_) void set_nodelist_free(GSList *params) { - g_slist_foreach(params, slist_stnode_free, NULL); - g_slist_free(params); + g_slist_free_full(params, slist_stnode_free); } void |