aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-frame.c
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2018-05-04 10:16:28 +0200
committerAnders Broman <a.broman58@gmail.com>2018-05-04 10:16:54 +0000
commit3f49c0d3cac8389ad66802fde330245500619393 (patch)
tree597a9c89484c540c3a402af7b488c2a91dc9c93d /epan/dissectors/packet-frame.c
parent8815ac76db2e10f5ac0dd7d2f2dd434e2796acce (diff)
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 <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-frame.c')
-rw-r--r--epan/dissectors/packet-frame.c5
1 files changed, 2 insertions, 3 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;
}