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 /blob.c | |
parent | d3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff) | |
download | git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz |
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 'blob.c')
-rw-r--r-- | blob.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -10,12 +10,12 @@ struct blob *lookup_blob(const unsigned char *sha1) if (!obj) { struct blob *ret = alloc_blob_node(); created_object(sha1, &ret->object); - ret->object.type = TYPE_BLOB; + ret->object.type = OBJ_BLOB; return ret; } if (!obj->type) - obj->type = TYPE_BLOB; - if (obj->type != TYPE_BLOB) { + obj->type = OBJ_BLOB; + if (obj->type != OBJ_BLOB) { error("Object %s is a %s, not a blob", sha1_to_hex(sha1), typename(obj->type)); return NULL; |