diff options
author | Linus Torvalds <torvalds@osdl.org> | 2006-07-11 20:45:31 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-12 23:18:03 -0700 |
commit | 1974632c664c2d573b36a00fa993c1c13dd8a967 (patch) | |
tree | 435ba8ee055c206c984240fc28a20ef15bc47e4d /tag.c | |
parent | d3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff) | |
download | git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.xz |
Remove TYPE_* constant macros and use object_type enums consistently.
This updates the type-enumeration constants introduced to reduce
the memory footprint of "struct object" to match the type bits
already used in the packfile format, by removing the former
(i.e. TYPE_* constant macros) and using the latter (i.e. enum
object_type) throughout the code for consistency.
Eventually we can stop passing around the "type strings"
entirely, and this will help - no confusion about two different
integer enumeration.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -5,7 +5,7 @@ const char *tag_type = "tag"; struct object *deref_tag(struct object *o, const char *warn, int warnlen) { - while (o && o->type == TYPE_TAG) + while (o && o->type == OBJ_TAG) o = parse_object(((struct tag *)o)->tagged->sha1); if (!o && warn) { if (!warnlen) @@ -21,12 +21,12 @@ struct tag *lookup_tag(const unsigned char *sha1) if (!obj) { struct tag *ret = alloc_tag_node(); created_object(sha1, &ret->object); - ret->object.type = TYPE_TAG; + ret->object.type = OBJ_TAG; return ret; } if (!obj->type) - obj->type = TYPE_TAG; - if (obj->type != TYPE_TAG) { + obj->type = OBJ_TAG; + if (obj->type != OBJ_TAG) { error("Object %s is a %s, not a tree", sha1_to_hex(sha1), typename(obj->type)); return NULL; |