Switch "read_tree_recursive()" over to tree-walk functionality

Don't use the tree_entry list any more.

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

diff --git a/tree.c b/tree.c
index 88c22190307b2f86ef365af66ddcc71ba4cb2fb4..88f8fd58928ce699fbb6ee15f4dda2d9f08d2c5e 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -78,19 +78,26 @@ int read_tree_recursive(struct tree *tree,
                        int stage, const char **match,
                        read_tree_fn_t fn)
 {
                        int stage, const char **match,
                        read_tree_fn_t fn)
 {

-       struct tree_entry_list *list;
+       struct tree_desc desc;
+

        if (parse_tree(tree))
                return -1;
        if (parse_tree(tree))
                return -1;

-       list = tree->entries;
-       while (list) {
-               struct tree_entry_list *current = list;
-               list = list->next;
-               if (!match_tree_entry(base, baselen, current->name,
-                                     current->mode, match))
+
+       desc.buf = tree->buffer;
+       desc.size = tree->size;
+
+       while (desc.size) {
+               unsigned mode;
+               const char *name;
+               const unsigned char *sha1;
+
+               sha1 = tree_entry_extract(&desc, &name, &mode);
+               update_tree_entry(&desc);
+
+               if (!match_tree_entry(base, baselen, name, mode, match))

                        continue;
 
                        continue;
 

-               switch (fn(current->sha1, base, baselen,
-                          current->name, current->mode, stage)) {
+               switch (fn(sha1, base, baselen, name, mode, stage)) {

                case 0:
                        continue;
                case READ_TREE_RECURSIVE:
                case 0:
                        continue;
                case READ_TREE_RECURSIVE:


@@ -98,16 +105,16 @@ int read_tree_recursive(struct tree *tree,
                default:
                        return -1;
                }
                default:
                        return -1;
                }

-               if (current->directory) {
+               if (S_ISDIR(mode)) {

                        int retval;
                        int retval;

-                       int pathlen = strlen(current->name);
+                       int pathlen = strlen(name);

                        char *newbase;
 
                        newbase = xmalloc(baselen + 1 + pathlen);
                        memcpy(newbase, base, baselen);
                        char *newbase;
 
                        newbase = xmalloc(baselen + 1 + pathlen);
                        memcpy(newbase, base, baselen);

-                       memcpy(newbase + baselen, current->name, pathlen);
+                       memcpy(newbase + baselen, name, pathlen);

                        newbase[baselen + pathlen] = '/';
                        newbase[baselen + pathlen] = '/';

-                       retval = read_tree_recursive(lookup_tree(current->sha1),
+                       retval = read_tree_recursive(lookup_tree(sha1),

                                                     newbase,
                                                     baselen + pathlen + 1,
                                                     stage, match, fn);
                                                     newbase,
                                                     baselen + pathlen + 1,
                                                     stage, match, fn);