From 566f92b27618f67f59cc3642e17d9cb9c12634fa Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 21 Jul 2008 10:10:48 +0200 Subject: Adjust to new calling convention for read_tree_recursive() In GIT-1.6.0, read_tree_recursive takes an extra void pointer for callback data. We might want to use this to avoid some global variables, but for now lets just make sure that we can still compile. Signed-off-by: Lars Hjemli --- ui-tree.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'ui-tree.c') diff --git a/ui-tree.c b/ui-tree.c index 5a2dd3f..9a837e2 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -62,7 +62,8 @@ static void print_object(const unsigned char *sha1, char *path) static int ls_item(const unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned int mode, int stage) + const char *pathname, unsigned int mode, int stage, + void *cbdata) { char *name; char *fullpath; @@ -143,13 +144,14 @@ static void ls_tree(const unsigned char *sha1, char *path) } ls_head(); - read_tree_recursive(tree, "", 0, 1, NULL, ls_item); + read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL); ls_tail(); } static int walk_tree(const unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage) + const char *pathname, unsigned mode, int stage, + void *cbdata) { static int state; static char buffer[PATH_MAX]; @@ -176,7 +178,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, return 0; } } - ls_item(sha1, base, baselen, pathname, mode, stage); + ls_item(sha1, base, baselen, pathname, mode, stage, NULL); return 0; } @@ -216,6 +218,6 @@ void cgit_print_tree(const char *rev, char *path) } match_path = path; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); + read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); ls_tail(); } -- cgit v1.2.3-70-g09d2