Make the "struct tree_desc" operations available to others

We have operations to "extract" and "update" a "struct tree_desc", but we
only used them in tree-diff.c and they were static to that file.

But other tree traversal functions can use them to their advantage

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/diff.h b/diff.h
index 9a0169c03ceb82b5cc2c246fa9f70e2f8399ec33..32134d79b5942b21ef55549801f91b31d980e948 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -13,6 +13,9 @@ struct tree_desc {
        unsigned long size;
 };
 
        unsigned long size;
 };
 

+extern void update_tree_entry(struct tree_desc *);
+extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+

 struct diff_options;
 
 typedef void (*change_fn_t)(struct diff_options *options,
 struct diff_options;
 
 typedef void (*change_fn_t)(struct diff_options *options,

diff --git a/tree-diff.c b/tree-diff.c
index 382092bce0be4ac82098ccc9c19d52df80f4eafd..d978428910a33ee9443343beeb1574e79d2a71ad 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -9,7 +9,7 @@ static int nr_paths = 0;
 static const char **paths = NULL;
 static int *pathlens = NULL;
 
 static const char **paths = NULL;
 static int *pathlens = NULL;
 

-static void update_tree_entry(struct tree_desc *desc)
+void update_tree_entry(struct tree_desc *desc)

 {
        void *buf = desc->buf;
        unsigned long size = desc->size;
 {
        void *buf = desc->buf;
        unsigned long size = desc->size;


@@ -21,7 +21,7 @@ static void update_tree_entry(struct tree_desc *desc)
        desc->size = size - len;
 }
 
        desc->size = size - len;
 }
 

-static const unsigned char *extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)

 {
        void *tree = desc->buf;
        unsigned long size = desc->size;
 {
        void *tree = desc->buf;
        unsigned long size = desc->size;


@@ -56,8 +56,8 @@ static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
        const unsigned char *sha1, *sha2;
        int cmp, pathlen1, pathlen2;
 
        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);
 
        pathlen1 = strlen(path1);
        pathlen2 = strlen(path2);


@@ -109,7 +109,7 @@ static int interesting(struct tree_desc *desc, const char *base)
        if (!nr_paths)
                return 1;
 
        if (!nr_paths)
                return 1;
 

-       (void)extract(desc, &path, &mode);
+       (void)tree_entry_extract(desc, &path, &mode);

 
        pathlen = strlen(path);
        baselen = strlen(base);
 
        pathlen = strlen(path);
        baselen = strlen(base);


@@ -167,7 +167,7 @@ static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
 {
        unsigned mode;
        const char *path;
 {
        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];
 
        if (opt->recursive && S_ISDIR(mode)) {
                char type[20];