git-svn: t/t91??-*: optimize the tests a bit

diff --git a/tree.c b/tree.c
index fb187242596062efbf487f035b7508451ca7a426..b6f02fecc46ec4633dc1ee75f38bc90761a4fbe3 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -4,7 +4,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "tree-walk.h"
-#include <stdlib.h>
 
 const char *tree_type = "tree";
 
@@ -25,7 +24,7 @@ static int read_one_entry(const unsigned char *sha1, const char *base, int basel
        ce->ce_flags = create_ce_flags(baselen + len, stage);
        memcpy(ce->name, base, baselen);
        memcpy(ce->name + baselen, pathname, len+1);
-       memcpy(ce->sha1, sha1, 20);
+       hashcpy(ce->sha1, sha1);
        return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
 }
 
@@ -79,6 +78,7 @@ int read_tree_recursive(struct tree *tree,
                        read_tree_fn_t fn)
 {
        struct tree_desc desc;
+       struct name_entry entry;
 
        if (parse_tree(tree))
                return -1;
@@ -86,18 +86,11 @@ int read_tree_recursive(struct tree *tree,
        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))
+       while (tree_entry(&desc, &entry)) {
+               if (!match_tree_entry(base, baselen, entry.path, entry.mode, match))
                        continue;
 
-               switch (fn(sha1, base, baselen, name, mode, stage)) {
+               switch (fn(entry.sha1, base, baselen, entry.path, entry.mode, stage)) {
                case 0:
                        continue;
                case READ_TREE_RECURSIVE:
@@ -105,18 +98,17 @@ int read_tree_recursive(struct tree *tree,
                default:
                        return -1;
                }
-               if (S_ISDIR(mode)) {
+               if (S_ISDIR(entry.mode)) {
                        int retval;
-                       int pathlen = strlen(name);
                        char *newbase;
 
-                       newbase = xmalloc(baselen + 1 + pathlen);
+                       newbase = xmalloc(baselen + 1 + entry.pathlen);
                        memcpy(newbase, base, baselen);
-                       memcpy(newbase + baselen, name, pathlen);
-                       newbase[baselen + pathlen] = '/';
-                       retval = read_tree_recursive(lookup_tree(sha1),
+                       memcpy(newbase + baselen, entry.path, entry.pathlen);
+                       newbase[baselen + entry.pathlen] = '/';
+                       retval = read_tree_recursive(lookup_tree(entry.sha1),
                                                     newbase,
-                                                    baselen + pathlen + 1,
+                                                    baselen + entry.pathlen + 1,
                                                     stage, match, fn);
                        free(newbase);
                        if (retval)
@@ -136,26 +128,27 @@ struct tree *lookup_tree(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct tree *ret = xcalloc(1, sizeof(struct tree));
+               struct tree *ret = alloc_tree_node();
                created_object(sha1, &ret->object);
-               ret->object.type = tree_type;
+               ret->object.type = OBJ_TREE;
                return ret;
        }
        if (!obj->type)
-               obj->type = tree_type;
-       if (obj->type != tree_type) {
-               error("Object %s is a %s, not a tree", 
-                     sha1_to_hex(sha1), obj->type);
+               obj->type = OBJ_TREE;
+       if (obj->type != OBJ_TREE) {
+               error("Object %s is a %s, not a tree",
+                     sha1_to_hex(sha1), typename(obj->type));
                return NULL;
        }
        return (struct tree *) obj;
 }
 
-static int track_tree_refs(struct tree *item)
+static void track_tree_refs(struct tree *item)
 {
        int n_refs = 0, i;
        struct object_refs *refs;
        struct tree_desc desc;
+       struct name_entry entry;
 
        /* Count how many entries there are.. */
        desc.buf = item->buffer;
@@ -170,22 +163,16 @@ static int track_tree_refs(struct tree *item)
        refs = alloc_object_refs(n_refs);
        desc.buf = item->buffer;
        desc.size = item->size;
-       while (desc.size) {
-               unsigned mode;
-               const char *name;
-               const unsigned char *sha1;
+       while (tree_entry(&desc, &entry)) {
                struct object *obj;
 
-               sha1 = tree_entry_extract(&desc, &name, &mode);
-               update_tree_entry(&desc);
-               if (S_ISDIR(mode))
-                       obj = &lookup_tree(sha1)->object;
+               if (S_ISDIR(entry.mode))
+                       obj = &lookup_tree(entry.sha1)->object;
                else
-                       obj = &lookup_blob(sha1)->object;
+                       obj = &lookup_blob(entry.sha1)->object;
                refs->ref[i++] = obj;
        }
        set_object_refs(&item->object, refs);
-       return 0;
 }
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
@@ -227,11 +214,11 @@ struct tree *parse_tree_indirect(const unsigned char *sha1)
        do {
                if (!obj)
                        return NULL;
-               if (obj->type == tree_type)
+               if (obj->type == OBJ_TREE)
                        return (struct tree *) obj;
-               else if (obj->type == commit_type)
+               else if (obj->type == OBJ_COMMIT)
                        obj = &(((struct commit *) obj)->tree->object);
-               else if (obj->type == tag_type)
+               else if (obj->type == OBJ_TAG)
                        obj = ((struct tag *) obj)->tagged;
                else
                        return NULL;