summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-22 21:03:03 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-04-23 08:05:02 (GMT)
commit777c98453872ceb59dc8bf509f5519bf258fd638 (patch)
treec404132b3a298a0d4c1f0b91faf4bb2fcfae079f
parent4e0e2271a75f2577e94f983b81a7eab2a649f527 (diff)
downloadlibnice-777c98453872ceb59dc8bf509f5519bf258fd638.tar.gz
libnice-777c98453872ceb59dc8bf509f5519bf258fd638.tar.xz
discovery: Use g_slist_free_full for discovery list
-rw-r--r--agent/discovery.c14
-rw-r--r--agent/discovery.h1
2 files changed, 5 insertions, 10 deletions
diff --git a/agent/discovery.c b/agent/discovery.c
index b76f474..d8e452a 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -71,13 +71,10 @@ static inline int priv_timer_expired (GTimeVal *timer, GTimeVal *now)
/*
* Frees the CandidateDiscovery structure pointed to
- * by 'user data'. Compatible with g_slist_foreach().
+ * by 'user data'. Compatible with g_slist_free_full().
*/
-void discovery_free_item (gpointer data, gpointer user_data)
+static void discovery_free_item (CandidateDiscovery *cand)
{
- CandidateDiscovery *cand = data;
- g_assert (user_data == NULL);
-
g_slice_free (CandidateDiscovery, cand);
}
@@ -86,9 +83,8 @@ void discovery_free_item (gpointer data, gpointer user_data)
*/
void discovery_free (NiceAgent *agent)
{
-
- g_slist_foreach (agent->discovery_list, discovery_free_item, NULL);
- g_slist_free (agent->discovery_list);
+ g_slist_free_full (agent->discovery_list,
+ (GDestroyNotify) discovery_free_item);
agent->discovery_list = NULL;
agent->discovery_unsched_items = 0;
@@ -115,7 +111,7 @@ void discovery_prune_stream (NiceAgent *agent, guint stream_id)
if (cand->stream->id == stream_id) {
agent->discovery_list = g_slist_remove (agent->discovery_list, cand);
- discovery_free_item (cand, NULL);
+ discovery_free_item (cand);
}
i = next;
}
diff --git a/agent/discovery.h b/agent/discovery.h
index 5a12a8c..6d848a5 100644
--- a/agent/discovery.h
+++ b/agent/discovery.h
@@ -88,7 +88,6 @@ void refresh_prune_stream (NiceAgent *agent, guint stream_id);
void refresh_cancel (CandidateRefresh *refresh);
-void discovery_free_item (gpointer data, gpointer user_data);
void discovery_free (NiceAgent *agent);
void discovery_prune_stream (NiceAgent *agent, guint stream_id);
void discovery_schedule (NiceAgent *agent);