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>
This commit is contained in:

committed by
Junio C Hamano

parent
d3ba675aae
commit
1974632c66
6
commit.c
6
commit.c
@ -56,7 +56,7 @@ static struct commit *check_commit(struct object *obj,
|
||||
const unsigned char *sha1,
|
||||
int quiet)
|
||||
{
|
||||
if (obj->type != TYPE_COMMIT) {
|
||||
if (obj->type != OBJ_COMMIT) {
|
||||
if (!quiet)
|
||||
error("Object %s is a %s, not a commit",
|
||||
sha1_to_hex(sha1), typename(obj->type));
|
||||
@ -86,11 +86,11 @@ struct commit *lookup_commit(const unsigned char *sha1)
|
||||
if (!obj) {
|
||||
struct commit *ret = alloc_commit_node();
|
||||
created_object(sha1, &ret->object);
|
||||
ret->object.type = TYPE_COMMIT;
|
||||
ret->object.type = OBJ_COMMIT;
|
||||
return ret;
|
||||
}
|
||||
if (!obj->type)
|
||||
obj->type = TYPE_COMMIT;
|
||||
obj->type = OBJ_COMMIT;
|
||||
return check_commit(obj, sha1, 0);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user