revision: --max-age alone does not need limit_list() anymore.

[git.git] / tree-diff.c

diff --git a/tree-diff.c b/tree-diff.c
index 0ef06a9..7bb6109 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -9,34 +9,6 @@ static int nr_paths = 0;
 static const char **paths = NULL;
 static int *pathlens = NULL;
 
-static void update_tree_entry(struct tree_desc *desc)
-{
-       void *buf = desc->buf;
-       unsigned long size = desc->size;
-       int len = strlen(buf) + 1 + 20;
-
-       if (size < len)
-               die("corrupt tree file");
-       desc->buf = buf + len;
-       desc->size = size - len;
-}
-
-static const unsigned char *extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
-{
-       void *tree = desc->buf;
-       unsigned long size = desc->size;
-       int len = strlen(tree)+1;
-       const unsigned char *sha1 = tree + len;
-       const char *path = strchr(tree, ' ');
-       unsigned int mode;
-
-       if (!path || size < len + 20 || sscanf(tree, "%o", &mode) != 1)
-               die("corrupt tree file");
-       *pathp = path+1;
-       *modep = DIFF_FILE_CANON_MODE(mode);
-       return sha1;
-}
-
 static char *malloc_base(const char *base, const char *path, int pathlen)
 {
        int baselen = strlen(base);
@@ -56,8 +28,8 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
        const unsigned char *sha1, *sha2;
        int cmp, pathlen1, pathlen2;
 
-       sha1 = extract(t1, &path1, &mode1);
-       sha2 = extract(t2, &path2, &mode2);
+       sha1 = tree_entry_extract(t1, &path1, &mode1);
+       sha2 = tree_entry_extract(t2, &path2, &mode2);
 
        pathlen1 = strlen(path1);
        pathlen2 = strlen(path2);
@@ -109,7 +81,7 @@ static int interesting(struct tree_desc *desc, const char *base)
        if (!nr_paths)
                return 1;
 
-       (void)extract(desc, &path, &mode);
+       (void)tree_entry_extract(desc, &path, &mode);
 
        pathlen = strlen(path);
        baselen = strlen(base);
@@ -167,7 +139,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
 {
        unsigned mode;
        const char *path;
-       const unsigned char *sha1 = extract(desc, &path, &mode);
+       const unsigned char *sha1 = tree_entry_extract(desc, &path, &mode);
 
        if (opt->recursive && S_ISDIR(mode)) {
                char type[20];
@@ -263,6 +235,10 @@ void diff_tree_setup_paths(const char **p)
 
                paths = p;
                nr_paths = count_paths(paths);
+               if (nr_paths == 0) {
+                       pathlens = NULL;
+                       return;
+               }
                pathlens = xmalloc(nr_paths * sizeof(int));
                for (i=0; i<nr_paths; i++)
                        pathlens[i] = strlen(paths[i]);