summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-07-12 03:45:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-13 06:18:03 (GMT)
commit1974632c664c2d573b36a00fa993c1c13dd8a967 (patch)
tree435ba8ee055c206c984240fc28a20ef15bc47e4d /object.c
parentd3ba675aae3c6c5722ad15cd9d0f3b7634e976ce (diff)
downloadgit-1974632c664c2d573b36a00fa993c1c13dd8a967.zip
git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.gz
git-1974632c664c2d573b36a00fa993c1c13dd8a967.tar.bz2
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 'object.c')
-rw-r--r--object.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/object.c b/object.c
index 37277f9..b5d8ed4 100644
--- a/object.c
+++ b/object.c
@@ -19,7 +19,8 @@ struct object *get_indexed_object(unsigned int idx)
}
const char *type_names[] = {
- "none", "blob", "tree", "commit", "bad"
+ "none", "commit", "tree", "blob", "tag",
+ "bad type 5", "bad type 6", "delta", "bad",
};
static unsigned int hash_obj(struct object *obj, unsigned int n)
@@ -88,7 +89,7 @@ void created_object(const unsigned char *sha1, struct object *obj)
{
obj->parsed = 0;
obj->used = 0;
- obj->type = TYPE_NONE;
+ obj->type = OBJ_NONE;
obj->flags = 0;
memcpy(obj->sha1, sha1, 20);
@@ -131,7 +132,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
if (!obj) {
union any_object *ret = xcalloc(1, sizeof(*ret));
created_object(sha1, &ret->object);
- ret->object.type = TYPE_NONE;
+ ret->object.type = OBJ_NONE;
return &ret->object;
}
return obj;