TT#14008 rename g_tree_remove_all to avoid namespace conflict

closes #1327 Change-Id: I30e745a7d2a2b0fa8cef90ecb76881071c437695
5 years ago · c740b8ac57
parent 758dc9fdbc
commit c740b8ac57
2 changed files with 5 additions and 5 deletions
--- a/daemon/ice.c
+++ b/daemon/ice.c
@ -885,10 +885,10 @@ static void __recalc_pair_prios(struct ice_agent *ag) {

 	ilog(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;
--- 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);