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-blob.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ui-blob.c') diff --git a/ui-blob.c b/ui-blob.c index 73a8c1d..3cda03d 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -13,7 +13,8 @@ static char *match_path; static unsigned char *matched_sha1; -static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { +static int walk_tree(const unsigned char *sha1, const char *base,int baselen, + const char *pathname, unsigned mode, int stage, void *cbdata) { if(strncmp(base,match_path,baselen) || strcmp(match_path+baselen,pathname) ) return READ_TREE_RECURSIVE; @@ -49,7 +50,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head) commit = lookup_commit_reference(sha1); match_path = path; matched_sha1 = sha1; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); + read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); type = sha1_object_info(sha1,&size); } -- cgit v1.2.3-24-g4f1b