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>

diff --git a/ui-blob.c b/ui-blob.c
index 73a8c1d8e0bcf4534df5b08e9dc2e0ef848e533b..3cda03d37992e987a3000613b01d6d7ac325db18 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -13,7 +13,8 @@
 static char *match_path;
 static unsigned char *matched_sha1;
 
 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;
        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;
                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);
        }
 
                type = sha1_object_info(sha1,&size);
        }
 

diff --git a/ui-tree.c b/ui-tree.c
index 5a2dd3f2946e3b5a2783744be144eb4628da8131..9a837e2a058c28f8b371a73d04e725ec9dab8951 100644 (file)
--- 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,
 
 
 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;
 {
        char *name;
        char *fullpath;


@@ -143,13 +144,14 @@ static void ls_tree(const unsigned char *sha1, char *path)
        }
 
        ls_head();
        }
 
        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,
        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];
 {
        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;
                }
        }
                        return 0;
                }
        }

-       ls_item(sha1, base, baselen, pathname, mode, stage);
+       ls_item(sha1, base, baselen, pathname, mode, stage, NULL);

        return 0;
 }
 
        return 0;
 }
 


@@ -216,6 +218,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = 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();
 }
        ls_tail();
 }