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 <hjemli@gmail.com>

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
@@ -4,25 +4,26 @@
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 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;
 	memmove(matched_sha1,sha1,20);
 	return 0;
 }
 
 void cgit_print_blob(const char *hex, char *path, const char *head)
 {
 
 	unsigned char sha1[20];
 	enum object_type type;
@@ -40,25 +41,25 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 		if (get_sha1(head,sha1)) {
 			cgit_print_error(fmt("Bad ref: %s", head));
 			return;
 		}
 	}
 
 	type = sha1_object_info(sha1, &size);
 
 	if((!hex) && type == OBJ_COMMIT && path) {
 		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);
 	}
 
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s", hex));
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		cgit_print_error(fmt("Error reading object %s", hex));
 		return;
diff --git a/ui-tree.c b/ui-tree.c
index 5a2dd3f..9a837e2 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -53,25 +53,26 @@ static void print_object(const unsigned char *sha1, char *path)
 			start = idx + 1;
 		}
 		idx++;
 	}
 	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 : "",
 		       ctx.qry.path ? "/" : "", name);
 
 	if (!S_ISGITLINK(mode)) {
 		type = sha1_object_info(sha1, &size);
@@ -134,31 +135,32 @@ static void ls_tail()
 static void ls_tree(const unsigned char *sha1, char *path)
 {
 	struct tree *tree;
 
 	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);
 		url = cgit_pageurl(ctx.qry.repo, "tree",
 				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
 		html("/");
 		cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
@@ -167,25 +169,25 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
 		if (S_ISDIR(mode)) {
 			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
  */
 void cgit_print_tree(const char *rev, char *path)
 {
 	unsigned char sha1[20];
@@ -207,15 +209,15 @@ void cgit_print_tree(const char *rev, char *path)
 	}
 
 	html("path: <a href='");
 	html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
 	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();
 }