proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-18 21:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree: Add payload to git_tree_walk

Browse Source
This commit is contained in:
Vicent Marti 2011-11-17 02:13:46 +01:00
parent 9432af36fc
commit 2ba14f2367
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git2/tree.h
View File

@ -284,7 +284,7 @@ GIT_EXTERN(int) git_treebuilder_write(git_oid *oid, git_repository *repo, git_tr
GIT_EXTERN(int) git_tree_get_subtree(git_tree **subtree, git_tree *root, const char *subtree_path); GIT_EXTERN(int) git_tree_get_subtree(git_tree **subtree, git_tree *root, const char *subtree_path);
/** Callback for the tree traversal method */ /** Callback for the tree traversal method */
typedef int (*git_treewalk_cb)(const char *root, git_tree_entry *entry); typedef int (*git_treewalk_cb)(const char *root, git_tree_entry *entry, void *payload);
/** Tree traversal modes */ /** Tree traversal modes */
enum git_treewalk_mode { enum git_treewalk_mode {
@ -310,7 +310,7 @@ enum git_treewalk_mode {
* @param mode Traversal mode (pre or post-order) * @param mode Traversal mode (pre or post-order)
* @return GIT_SUCCESS or an error code * @return GIT_SUCCESS or an error code
*/ */
GIT_EXTERN(int) git_tree_walk(git_tree *walk, git_treewalk_cb callback, int mode); GIT_EXTERN(int) git_tree_walk(git_tree *walk, git_treewalk_cb callback, int mode, void *payload);
/** @} */ /** @} */
GIT_END_DECL GIT_END_DECL

14
src/tree.c
View File

@ -683,7 +683,8 @@ static int tree_walk_post(
git_tree *tree, git_tree *tree,
git_treewalk_cb callback, git_treewalk_cb callback,
char *root, char *root,
size_t root_len) size_t root_len,
void *payload)
{ {
int error; int error;
unsigned int i; unsigned int i;
@ -693,7 +694,7 @@ static int tree_walk_post(
root[root_len] = '\0'; root[root_len] = '\0';
if (callback(root, entry) < 0) if (callback(root, entry, payload) < 0)
continue; continue;
if (ENTRY_IS_TREE(entry)) { if (ENTRY_IS_TREE(entry)) {
@ -707,7 +708,10 @@ static int tree_walk_post(
root[root_len + entry->filename_len] = '/'; root[root_len + entry->filename_len] = '/';
tree_walk_post(subtree, tree_walk_post(subtree,
callback, root, root_len + entry->filename_len + 1); callback, root,
root_len + entry->filename_len + 1,
payload
);
git_tree_close(subtree); git_tree_close(subtree);
} }
@ -716,14 +720,14 @@ static int tree_walk_post(
return GIT_SUCCESS; return GIT_SUCCESS;
} }
int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode) int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payload)
{ {
char root_path[GIT_PATH_MAX]; char root_path[GIT_PATH_MAX];
root_path[0] = '\0'; root_path[0] = '\0';
switch (mode) { switch (mode) {
case GIT_TREEWALK_POST: case GIT_TREEWALK_POST:
return tree_walk_post(tree, callback, root_path, 0); return tree_walk_post(tree, callback, root_path, 0, payload);
case GIT_TREEWALK_PRE: case GIT_TREEWALK_PRE:
return git__throw(GIT_ENOTIMPLEMENTED, return git__throw(GIT_ENOTIMPLEMENTED,