summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-blob.c5
-rw-r--r--ui-tree.c12
2 files changed, 10 insertions, 7 deletions
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);
}
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();
}