From 3f49c0d3cac8389ad66802fde330245500619393 Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Fri, 4 May 2018 10:16:28 +0200 Subject: [PATCH] g_slist_free_full: Use g_slist_free_full() in a couple of places. Change-Id: I38617ee289196f9807cf285af60d670bd5477687 Reviewed-on: https://code.wireshark.org/review/27327 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-frame.c | 5 ++--- epan/dissectors/packet-zbee-nwk-gp.c | 6 ++---- tshark.c | 8 +++----- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 03afaff858..8a61a5a323 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -193,7 +193,7 @@ register_frame_end_routine(packet_info *pinfo, void (*func)(void)) typedef void (*void_func_t)(void); static void -call_frame_end_routine(gpointer routine, gpointer dummy _U_) +call_frame_end_routine(gpointer routine) { void_func_t func = (void_func_t)routine; (*func)(); @@ -731,8 +731,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* if (pinfo->frame_end_routines) { - g_slist_foreach(pinfo->frame_end_routines, &call_frame_end_routine, NULL); - g_slist_free(pinfo->frame_end_routines); + g_slist_free_full(pinfo->frame_end_routines, &call_frame_end_routine); pinfo->frame_end_routines = NULL; } diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index ff7d32efc6..72d1a70bf5 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -1486,7 +1486,7 @@ gp_init_zbee_security(void) } } -static void zbee_free_key_record(gpointer ptr, gpointer user_data _U_) +static void zbee_free_key_record(gpointer ptr) { key_record_t *k; @@ -1504,9 +1504,7 @@ gp_cleanup_zbee_security(void) if (!zbee_gp_keyring) return; - g_slist_foreach(zbee_gp_keyring, zbee_free_key_record, NULL); - - g_slist_free(zbee_gp_keyring); + g_slist_free_full(zbee_gp_keyring, zbee_free_key_record); zbee_gp_keyring = NULL; } diff --git a/tshark.c b/tshark.c index fec5266d63..82f3ddf0e9 100644 --- a/tshark.c +++ b/tshark.c @@ -266,7 +266,7 @@ string_compare(gconstpointer a, gconstpointer b) } static void -string_elem_print(gpointer data, gpointer not_used _U_) +string_elem_print(gpointer data) { fprintf(stderr, " %s - %s\n", ((struct string_elem *)data)->sstr, @@ -289,8 +289,7 @@ list_capture_types(void) { list = g_slist_insert_sorted(list, &captypes[i], string_compare); } } - g_slist_foreach(list, string_elem_print, NULL); - g_slist_free(list); + g_slist_free_full(list, string_elem_print); g_free(captypes); } @@ -311,8 +310,7 @@ list_read_capture_types(void) { captypes[i].lstr = (open_routines[i].type == OPEN_INFO_MAGIC) ? magic : heuristic; list = g_slist_insert_sorted(list, &captypes[i], string_compare); } - g_slist_foreach(list, string_elem_print, NULL); - g_slist_free(list); + g_slist_free_full(list, string_elem_print); g_free(captypes); }