aboutsummaryrefslogtreecommitdiffstats
path: root/caputils
diff options
context:
space:
mode:
authorAnders <anders.broman@ericsson.com>2018-04-17 12:48:35 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-17 15:01:24 +0000
commit25a337cdb060962606c5caf7d918c2ed0aedf6e2 (patch)
tree49765468d8a9fee3a0c2faa79421a132677660bf /caputils
parent3dab804250ad4c648438fb23a107d74b51f4480f (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 'caputils')
-rw-r--r--caputils/capture-pcap-util.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/caputils/capture-pcap-util.c b/caputils/capture-pcap-util.c
index 581ed15c76..3464827828 100644
--- a/caputils/capture-pcap-util.c
+++ b/caputils/capture-pcap-util.c
@@ -527,12 +527,6 @@ get_interface_list_findalldevs(int *err, char **err_str)
#endif /* HAVE_PCAP_FINDALLDEVS */
static void
-free_if_info_addr_cb(gpointer addr, gpointer user_data _U_)
-{
- g_free(addr);
-}
-
-static void
free_if_cb(gpointer data, gpointer user_data _U_)
{
if_info_t *if_info = (if_info_t *)data;
@@ -541,8 +535,7 @@ free_if_cb(gpointer data, gpointer user_data _U_)
g_free(if_info->friendly_name);
g_free(if_info->vendor_description);
g_free(if_info->extcap);
- g_slist_foreach(if_info->addrs, free_if_info_addr_cb, NULL);
- g_slist_free(if_info->addrs);
+ g_slist_free_full(if_info->addrs, g_free);
g_free(if_info);
}