diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index 19db00fc4952d54558e05c483c2fd41d83762ce2..4a82ce703ce204373ae2f2fda5ca75570daabe02 100644
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -953,7 +953,7 @@ static int adjust_nodes(zone_tree_t *nodes, zone_adjust_arg_t *adjust_arg,
adjust_arg->previous_node = NULL;
hattrie_build_index(nodes);
- int ret = zone_tree_apply_inorder(nodes, callback, adjust_arg);
+ int ret = zone_tree_apply(nodes, callback, adjust_arg);
if (adjust_arg->first_node) {
adjust_arg->first_node->prev = adjust_arg->previous_node;
@@ -1051,7 +1051,7 @@ int zone_contents_tree_apply_inorder(zone_contents_t *zone,
.data = data
};
- return zone_tree_apply_inorder(zone->nodes, tree_apply_cb, &f);
+ return zone_tree_apply(zone->nodes, tree_apply_cb, &f);
}
int zone_contents_nsec3_apply_inorder(zone_contents_t *zone,
@@ -1066,7 +1066,7 @@ int zone_contents_nsec3_apply_inorder(zone_contents_t *zone,
.data = data
};
- return zone_tree_apply_inorder(zone->nsec3_nodes, tree_apply_cb, &f);
+ return zone_tree_apply(zone->nsec3_nodes, tree_apply_cb, &f);
}
int zone_contents_shallow_copy(const zone_contents_t *from, zone_contents_t **to)
diff --git a/src/knot/zone/zone-tree.c b/src/knot/zone/zone-tree.c
index dbcc9f68988cf55d240f9c10534df6b08cceae85..4b61c70f1a09d717f36173d4e370e02c11321833 100644
--- a/src/knot/zone/zone-tree.c
+++ b/src/knot/zone/zone-tree.c
@@ -186,9 +186,7 @@ int zone_tree_delete_empty_node(zone_tree_t *tree, zone_node_t *node)
return KNOT_EOK;
}
-int zone_tree_apply_inorder(zone_tree_t *tree,
- zone_tree_apply_cb_t function,
- void *data)
+int zone_tree_apply(zone_tree_t *tree, zone_tree_apply_cb_t function, void *data)
{
if (function == NULL) {
return KNOT_EINVAL;
@@ -198,34 +196,7 @@ int zone_tree_apply_inorder(zone_tree_t *tree,
return KNOT_EOK;
}
- int result = KNOT_EOK;
-
- hattrie_iter_t *i = hattrie_iter_begin(tree, 1);
- while(!hattrie_iter_finished(i)) {
- result = function((zone_node_t **)hattrie_iter_val(i), data);
- if (result != KNOT_EOK) {
- break;
- }
- hattrie_iter_next(i);
- }
- hattrie_iter_free(i);
-
- return result;
-}
-
-int zone_tree_apply(zone_tree_t *tree,
- zone_tree_apply_cb_t function,
- void *data)
-{
- if (function == NULL) {
- return KNOT_EINVAL;
- }
-
- if (zone_tree_is_empty(tree)) {
- return KNOT_EOK;
- }
-
- return hattrie_apply_rev(tree, (int (*)(value_t*,void*))function, data);
+ return hattrie_apply_rev(tree, (int (*)(value_t *, void *))function, data);
}
void zone_tree_free(zone_tree_t **tree)
diff --git a/src/knot/zone/zone-tree.h b/src/knot/zone/zone-tree.h
index ad20590182cee77d442f8d72d351a88c965e7085..93bea75aeb08e7c349d2fba853c17e94a8fdea8a 100644
--- a/src/knot/zone/zone-tree.h
+++ b/src/knot/zone/zone-tree.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -130,29 +130,7 @@ int zone_tree_remove(zone_tree_t *tree,
int zone_tree_delete_empty_node(zone_tree_t *tree, zone_node_t *node);
/*!
- * \brief Applies the given function to each node in the zone.
- *
- * This function uses in-order depth-first forward traversal, i.e. the function
- * is first recursively applied to left subtree, then to the root and then to
- * the right subtree.
- *
- * \note This implies that the zone is stored in a binary tree. Is there a way
- * to make this traversal independent on the underlying structure?
- *
- * \param tree Zone tree to apply the function to.
- * \param function Function to be applied to each node of the zone.
- * \param data Arbitrary data to be passed to the function.
- *
- * \retval KNOT_EOK
- * \retval KNOT_EINVAL
- */
-int zone_tree_apply_inorder(zone_tree_t *tree,
- zone_tree_apply_cb_t function,
- void *data);
-
-/*!
- * \brief Applies the given function to each node in the zone. No
- * specific order is maintained.
+ * \brief Applies the given function to each node in the zone in order.
*
* \param tree Zone tree to apply the function to.
* \param function Function to be applied to each node of the zone.
@@ -161,8 +139,7 @@ int zone_tree_apply_inorder(zone_tree_t *tree,
* \retval KNOT_EOK
* \retval KNOT_EINVAL
*/
-int zone_tree_apply(zone_tree_t *tree,
- zone_tree_apply_cb_t function, void *data);
+int zone_tree_apply(zone_tree_t *tree, zone_tree_apply_cb_t function, void *data);
/*!
* \brief Destroys the zone tree, not touching the saved data.
diff --git a/tests/ztree.c b/tests/ztree.c
index b8b2ef28bcdd4e3ba3ed744298fc1e8270934236..84f5317b958ca21af718a7c510c92c3b778bc47f 100644
--- a/tests/ztree.c
+++ b/tests/ztree.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
/* 5. ordered traversal */
unsigned i = 0;
- int ret = zone_tree_apply_inorder(t, ztree_iter_data, &i);
+ int ret = zone_tree_apply(t, ztree_iter_data, &i);
ok (ret == KNOT_EOK, "ztree: ordered traversal");
zone_tree_free(&t);