X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=object.h;h=a0762b66725a1f8af45ea65147178b9130e2e056;hb=885a86abe2e9f7b96a4e2012183c6751635840aa;hp=336d986b51831db7812fd9bbd6a818803935fde2;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git

diff --git a/object.h b/object.h
index 336d986b..a0762b66 100644
--- a/object.h
+++ b/object.h
@@ -9,22 +9,38 @@ struct object_list {
 
 struct object_refs {
 	unsigned count;
-	struct object *ref[0];
+	struct object *ref[FLEX_ARRAY]; /* more */
 };
 
+#define TYPE_BITS   3
+#define FLAG_BITS  27
+
+#define TYPE_NONE   0
+#define TYPE_BLOB   1
+#define TYPE_TREE   2
+#define TYPE_COMMIT 3
+#define TYPE_TAG    4
+#define TYPE_BAD    5
+
 struct object {
 	unsigned parsed : 1;
 	unsigned used : 1;
-	unsigned int flags;
+	unsigned type : TYPE_BITS;
+	unsigned flags : FLAG_BITS;
 	unsigned char sha1[20];
-	const char *type;
 	struct object_refs *refs;
 	void *util;
 };
 
 extern int track_object_refs;
-extern int nr_objs;
+extern int obj_allocs;
 extern struct object **objs;
+extern const char *type_names[];
+
+static inline const char *typename(unsigned int type)
+{
+	return type_names[type > TYPE_TAG ? TYPE_BAD : type];
+}
 
 /** Internal only **/
 struct object *lookup_object(const unsigned char *sha1);