proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-04 01:40:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree: allow the user to skip an entry or cancel the walk

Browse Source 
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.
This commit is contained in:
Carlos Martín Nieto 2012-08-13 14:07:47 +02:00
parent 53ae12359d
commit a6bf16878a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/git2/tree.h
View File

@ -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

11
src/tree.c
View File

@ -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;
}