From 9e4cdf997043f996a07b9a0758292f75fac4069b Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 9 Aug 2021 14:53:16 -0400 Subject: [PATCH] TT#14008 rename g_tree_remove_all to avoid namespace conflict closes #1327 Change-Id: I30e745a7d2a2b0fa8cef90ecb76881071c437695 --- daemon/ice.c | 8 ++++---- include/aux.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/ice.c b/daemon/ice.c index 364e1c388..d513b1ffa 100644 --- a/daemon/ice.c +++ b/daemon/ice.c @@ -908,10 +908,10 @@ static void __recalc_pair_prios(struct ice_agent *ag) { ilogs(ice, LOG_DEBUG, "Recalculating all ICE pair priorities"); - g_tree_remove_all(&nominated, ag->nominated_pairs); - g_tree_remove_all(&succ, ag->succeeded_pairs); - g_tree_remove_all(&valid, ag->valid_pairs); - g_tree_remove_all(&all, ag->all_pairs); + g_tree_find_remove_all(&nominated, ag->nominated_pairs); + g_tree_find_remove_all(&succ, ag->succeeded_pairs); + g_tree_find_remove_all(&valid, ag->valid_pairs); + g_tree_find_remove_all(&all, ag->all_pairs); for (l = ag->candidate_pairs.head; l; l = l->next) { pair = l->data; diff --git a/include/aux.h b/include/aux.h index 11e20fc37..d92c7bc07 100644 --- a/include/aux.h +++ b/include/aux.h @@ -133,7 +133,7 @@ INLINE void g_tree_find_all(GQueue *out, GTree *t, GEqualFunc f, void *data) { INLINE void g_tree_get_values(GQueue *out, GTree *t) { g_tree_find_all(out, t, NULL, NULL); } -INLINE void g_tree_remove_all(GQueue *out, GTree *t) { +INLINE void g_tree_find_remove_all(GQueue *out, GTree *t) { GList *l; g_queue_init(out); g_tree_find_all(out, t, NULL, NULL);