summaryrefslogtreecommitdiffabout
path: root/ui-tree.c
Side-by-side diff
Diffstat (limited to 'ui-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 5a2dd3f..9a837e2 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -57,17 +57,18 @@ static void print_object(const unsigned char *sha1, char *path)
htmlf(linefmt, ++lineno);
html_txt(buf + start);
html("</td></tr>\n");
html("</table>\n");
}
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;
enum object_type type;
unsigned long size = 0;
name = xstrdup(pathname);
fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
@@ -138,23 +139,24 @@ static void ls_tree(const unsigned char *sha1, char *path)
tree = parse_tree_indirect(sha1);
if (!tree) {
cgit_print_error(fmt("Not a tree object: %s",
sha1_to_hex(sha1)));
return;
}
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];
char *url;
if (state == 0) {
memcpy(buffer, base, baselen);
strcpy(buffer+baselen, pathname);
@@ -171,17 +173,17 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
state = 1;
ls_head();
return READ_TREE_RECURSIVE;
} else {
print_object(sha1, buffer);
return 0;
}
}
- ls_item(sha1, base, baselen, pathname, mode, stage);
+ ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
return 0;
}
/*
* Show a tree or a blob
* rev: the commit pointing at the root tree object
* path: path to tree or blob
@@ -211,11 +213,11 @@ void cgit_print_tree(const char *rev, char *path)
html("'>root</a>");
if (path == NULL) {
ls_tree(commit->tree->object.sha1, NULL);
return;
}
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();
}