From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Tue, 29 Jan 2008 11:03:17 +0000 (+0000)
Subject: rename.
X-Git-Tag: release-1.3.0~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3919c68e9f66619bcb60fc32279206d75e769d2;p=thirdparty%2Fldns.git

rename.
---

diff --git a/dnssec_zone.c b/dnssec_zone.c
index 3c23ac1c..e6908855 100644
--- a/dnssec_zone.c
+++ b/dnssec_zone.c
@@ -498,7 +498,7 @@ ldns_dnssec_zone_free(ldns_dnssec_zone *zone)
 	if (zone) {
 		if (zone->names) {
 			/* destroy all name structures within the tree */
-			traverse_postorder(zone->names,
+			ldns_traverse_postorder(zone->names,
 						    ldns_dnssec_name_node_free,
 						    NULL);
 			free(zone->names);
diff --git a/ldns/rbtree.h b/ldns/rbtree.h
index 7363847d..2509d7bb 100644
--- a/ldns/rbtree.h
+++ b/ldns/rbtree.h
@@ -201,7 +201,7 @@ void ldns_dnssec_rbtree_join(ldns_rbtree_t *tree1,
  * Call with node=variable of struct* with rbnode_t as first element.
  * with type is the type of a pointer to that struct. 
  */
-#define RBTREE_FOR(node, type, rbtree) \
+#define LDNS_RBTREE_FOR(node, type, rbtree) \
 	for(node=(type)ldns_rbtree_first(rbtree); \
 		(ldns_rbnode_t*)node != LDNS_RBTREE_NULL; \
 		node = (type)ldns_rbtree_next((ldns_rbnode_t*)node))
@@ -217,7 +217,7 @@ void ldns_dnssec_rbtree_join(ldns_rbtree_t *tree1,
  * 	The function must not alter the rbtree.
  * @param arg: user argument.
  */
-void traverse_postorder(ldns_rbtree_t* tree, void (*func)(ldns_rbnode_t*, void*),
-	void* arg);
+void ldns_traverse_postorder(ldns_rbtree_t* tree, 
+	void (*func)(ldns_rbnode_t*, void*), void* arg);
 
 #endif /* UTIL_RBTREE_H_ */
diff --git a/rbtree.c b/rbtree.c
index 3224e55f..686c97a0 100644
--- a/rbtree.c
+++ b/rbtree.c
@@ -633,12 +633,13 @@ ldns_rbtree_split(ldns_rbtree_t *tree,
 void
 ldns_rbtree_join(ldns_rbtree_t *tree1, ldns_rbtree_t *tree2)
 {
-	traverse_postorder(tree2, ldns_rbtree_insert_vref, tree1);
+	ldns_traverse_postorder(tree2, ldns_rbtree_insert_vref, tree1);
 }
 
 /** recursive descent traverse */
 static void 
-traverse_post(void (*func)(ldns_rbnode_t*, void*), void* arg, ldns_rbnode_t* node)
+traverse_post(void (*func)(ldns_rbnode_t*, void*), void* arg, 
+	ldns_rbnode_t* node)
 {
 	if(!node || node == LDNS_RBTREE_NULL)
 		return;
@@ -650,7 +651,8 @@ traverse_post(void (*func)(ldns_rbnode_t*, void*), void* arg, ldns_rbnode_t* nod
 }
 
 void 
-traverse_postorder(ldns_rbtree_t* tree, void (*func)(ldns_rbnode_t*, void*), void* arg)
+ldns_traverse_postorder(ldns_rbtree_t* tree, 
+	void (*func)(ldns_rbnode_t*, void*), void* arg)
 {
 	traverse_post(func, arg, tree->root);
 }