rename.

diff --git a/dnssec_zone.c b/dnssec_zone.c
index 3c23ac1cd1a41779654179f6211883936b9083c9..e6908855cf4a6d2452c5a1c6520d0a334a64b570 100644 (file)
--- 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 7363847d2ba16aa9f2042b25da5900f5fe068b88..2509d7bb37e08dfacc5e023f9e5fff0fdfe578c6 100644 (file)
--- 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 3224e55f726d17954d22fc6526a87b88ab3b38c1..686c97a0cfaebe7c1539e97c1442fd79bad9b930 100644 (file)
--- 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);
 }