Commit a6bf16878a121152f5bddf4d46f641e8f044d278
2012-08-13T14:07:47
tree: allow the user to skip an entry or cancel the walk Returning a negative cancels the walk, and returning a positive one causes us to skip an entry, which was previously done by a negative value. This allows us to stay consistent with the rest of the functions that take a callback and keeps the skipping functionality.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/include/git2/tree.h b/include/git2/tree.h
index b913406..85407d7 100644
--- a/include/git2/tree.h
+++ b/include/git2/tree.h
@@ -351,8 +351,9 @@ enum git_treewalk_mode {
* the current (relative) root for the entry and the entry
* data itself.
*
- * If the callback returns a negative value, the passed entry
- * will be skipped on the traversal.
+ * If the callback returns a positive value, the passed entry will be
+ * skipped on the traversal (in pre mode). A negative value stops the
+ * walk.
*
* @param tree The tree to walk
* @param callback Function to call on each tree entry
diff --git a/src/tree.c b/src/tree.c
index 911cbad..19250fe 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -787,8 +787,13 @@ static int tree_walk(
for (i = 0; i < tree->entries.length; ++i) {
git_tree_entry *entry = tree->entries.contents[i];
- if (preorder && callback(path->ptr, entry, payload) < 0)
- continue
+ if (preorder) {
+ error = callback(path->ptr, entry, payload);
+ if (error > 0)
+ continue;
+ if (error < 0)
+ return GIT_EUSER;
+ }
if (git_tree_entry__is_tree(entry)) {
git_tree *subtree;
@@ -813,7 +818,7 @@ static int tree_walk(
git_tree_free(subtree);
}
- if (!preorder && callback(path->ptr, entry, payload)) {
+ if (!preorder && callback(path->ptr, entry, payload) < 0) {
error = GIT_EUSER;
break;
}