X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=object.h;h=3d4ff4611f55d766cf2f82baa9771a80b50c85f9;hb=173a9cbe7031bc3574b3f41cb2d2375cf959ff2a;hp=336d986b51831db7812fd9bbd6a818803935fde2;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git

diff --git a/object.h b/object.h
index 336d986b5..3d4ff4611 100644
--- a/object.h
+++ b/object.h
@@ -4,27 +4,49 @@
 struct object_list {
 	struct object *item;
 	struct object_list *next;
-	const char *name;
 };
 
 struct object_refs {
 	unsigned count;
-	struct object *ref[0];
+	struct object *base;
+	struct object *ref[FLEX_ARRAY]; /* more */
 };
 
+struct object_array {
+	unsigned int nr;
+	unsigned int alloc;
+	struct object_array_entry {
+		struct object *item;
+		const char *name;
+	} *objects;
+};
+
+#define TYPE_BITS   3
+#define FLAG_BITS  27
+
+/*
+ * The object type is stored in 3 bits.
+ */
 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 struct object **objs;
+extern const char *type_names[9];
+
+extern unsigned int get_max_object_index(void);
+extern struct object *get_indexed_object(unsigned int);
+
+static inline const char *typename(unsigned int type)
+{
+	return type_names[type > OBJ_BAD ? OBJ_BAD : type];
+}
+
+extern struct object_refs *lookup_object_refs(struct object *);
 
 /** Internal only **/
 struct object *lookup_object(const unsigned char *sha1);
@@ -55,4 +77,7 @@ unsigned object_list_length(struct object_list *list);
 
 int object_list_contains(struct object_list *list, struct object *obj);
 
+/* Object array handling .. */
+void add_object_array(struct object *obj, const char *name, struct object_array *array);
+
 #endif /* OBJECT_H */