aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-nwk-gp.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-zbee-nwk-gp.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-zbee-nwk-gp.c')
-rw-r--r--epan/dissectors/packet-zbee-nwk-gp.c6
1 files changed, 2 insertions, 4 deletions
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;
}