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
15
pack.h
15
pack.h
@ -1,20 +1,7 @@
|
||||
#ifndef PACK_H
|
||||
#define PACK_H
|
||||
|
||||
/*
|
||||
* The packed object type is stored in 3 bits.
|
||||
* The type value 0 is a reserved prefix if ever there is more than 7
|
||||
* object types, or any future format extensions.
|
||||
*/
|
||||
enum object_type {
|
||||
OBJ_EXT = 0,
|
||||
OBJ_COMMIT = 1,
|
||||
OBJ_TREE = 2,
|
||||
OBJ_BLOB = 3,
|
||||
OBJ_TAG = 4,
|
||||
/* 5/6 for future expansion */
|
||||
OBJ_DELTA = 7,
|
||||
};
|
||||
#include "object.h"
|
||||
|
||||
/*
|
||||
* Packed object header
|
||||
|
Reference in New Issue
Block a user