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/packet.c | |
| 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/packet.c')
| -rw-r--r-- | epan/packet.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/packet.c b/epan/packet.c index 80d754c10f..6383f653d2 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -139,8 +139,7 @@ destroy_depend_dissector_list(void *data) depend_dissector_list_t dissector_list = (depend_dissector_list_t)data; GSList **list = &(dissector_list->dissectors); - g_slist_foreach(*list, (GFunc)g_free, NULL); - g_slist_free(*list); + g_slist_free_full(*list, g_free); g_slice_free(struct depend_dissector_list, dissector_list); } @@ -158,7 +157,7 @@ static GHashTable *heur_dissector_lists = NULL; static GHashTable* heuristic_short_names = NULL; static void -destroy_heuristic_dissector_entry(gpointer data, gpointer user_data _U_) +destroy_heuristic_dissector_entry(gpointer data) { heur_dtbl_entry_t *hdtbl_entry = (heur_dtbl_entry_t *)data; g_free(hdtbl_entry->list_name); @@ -172,8 +171,7 @@ destroy_heuristic_dissector_list(void *data) heur_dissector_list_t dissector_list = (heur_dissector_list_t)data; GSList **list = &(dissector_list->dissectors); - g_slist_foreach(*list, destroy_heuristic_dissector_entry, NULL); - g_slist_free(*list); + g_slist_free_full(*list, destroy_heuristic_dissector_entry); g_slice_free(struct heur_dissector_list, dissector_list); } |