From e28f490426cd547fef74dc2bc37d426310d5b1ea Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 24 Aug 2014 22:35:52 +0200 Subject: Extcap: restore compatibility with GLib 2.16.0 While we are at it, fix what seem to be a memory leak in extcaps_init_initerfaces() Change-Id: I1bb9a1b44d16f986eedd192b15cce84c5881a917 Reviewed-on: https://code.wireshark.org/review/3820 Reviewed-by: Roland Knall Reviewed-by: Anders Broman Reviewed-by: Pascal Quantin --- extcap_parser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'extcap_parser.c') diff --git a/extcap_parser.c b/extcap_parser.c index 8fdbb1f0f5..29c9b9de9a 100644 --- a/extcap_parser.c +++ b/extcap_parser.c @@ -504,13 +504,14 @@ void extcap_free_arg(extcap_arg *a) { g_list_foreach(a->values, (GFunc) extcap_free_valuelist, NULL); } -static void extcap_free_arg_list_cb(gpointer listentry) { +static void extcap_free_arg_list_cb(gpointer listentry, gpointer data _U_) { if (listentry != NULL) extcap_free_arg((extcap_arg *) listentry); } void extcap_free_arg_list(GList *a) { - g_list_free_full(a, extcap_free_arg_list_cb); + g_list_foreach(a, extcap_free_arg_list_cb, NULL); + g_list_free(a); } static gint glist_find_numbered_arg(gconstpointer listelem, gconstpointer needle) { -- cgit v1.2.1