Remove TYPE_* constant macros and use object_type enums consistently.

[git/git.git] / tree.c

diff --git a/tree.c b/tree.c
index 1023655..a6032e3 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -131,12 +131,12 @@ struct tree *lookup_tree(const unsigned char *sha1)
        if (!obj) {
                struct tree *ret = alloc_tree_node();
                created_object(sha1, &ret->object);
        if (!obj) {
                struct tree *ret = alloc_tree_node();
                created_object(sha1, &ret->object);

-               ret->object.type = TYPE_TREE;
+               ret->object.type = OBJ_TREE;

                return ret;
        }
        if (!obj->type)
                return ret;
        }
        if (!obj->type)

-               obj->type = TYPE_TREE;
-       if (obj->type != TYPE_TREE) {
+               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;
                error("Object %s is a %s, not a tree",
                      sha1_to_hex(sha1), typename(obj->type));
                return NULL;


@@ -216,11 +216,11 @@ struct tree *parse_tree_indirect(const unsigned char *sha1)
        do {
                if (!obj)
                        return NULL;
        do {
                if (!obj)
                        return NULL;

-               if (obj->type == TYPE_TREE)
+               if (obj->type == OBJ_TREE)

                        return (struct tree *) obj;
                        return (struct tree *) obj;

-               else if (obj->type == TYPE_COMMIT)
+               else if (obj->type == OBJ_COMMIT)

                        obj = &(((struct commit *) obj)->tree->object);
                        obj = &(((struct commit *) obj)->tree->object);

-               else if (obj->type == TYPE_TAG)
+               else if (obj->type == OBJ_TAG)

                        obj = ((struct tag *) obj)->tagged;
                else
                        return NULL;
                        obj = ((struct tag *) obj)->tagged;
                else
                        return NULL;