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
8
fetch.c
8
fetch.c
@ -118,20 +118,20 @@ static struct object_list **process_queue_end = &process_queue;
|
||||
|
||||
static int process_object(struct object *obj)
|
||||
{
|
||||
if (obj->type == TYPE_COMMIT) {
|
||||
if (obj->type == OBJ_COMMIT) {
|
||||
if (process_commit((struct commit *)obj))
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
if (obj->type == TYPE_TREE) {
|
||||
if (obj->type == OBJ_TREE) {
|
||||
if (process_tree((struct tree *)obj))
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
if (obj->type == TYPE_BLOB) {
|
||||
if (obj->type == OBJ_BLOB) {
|
||||
return 0;
|
||||
}
|
||||
if (obj->type == TYPE_TAG) {
|
||||
if (obj->type == OBJ_TAG) {
|
||||
if (process_tag((struct tag *)obj))
|
||||
return -1;
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user