git-tar-tree: no more void pointer arithmetic

[git.git] / object.h

diff --git a/object.h b/object.h
index 5af530d..f4ee2e5 100644 (file)
--- a/object.h
+++ b/object.h
@@ -7,18 +7,39 @@ struct object_list {
        const char *name;
 };
 
+struct object_refs {
+       unsigned count;
+       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_list *refs;
-       void *util;
+       struct object_refs *refs;
 };
 
-extern int nr_objs;
+extern int track_object_refs;
+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);
@@ -34,13 +55,17 @@ struct object *parse_object(const unsigned char *sha1);
 /** Returns the object, with potentially excess memory allocated. **/
 struct object *lookup_unknown_object(const unsigned  char *sha1);
 
-void add_ref(struct object *refer, struct object *target);
+struct object_refs *alloc_object_refs(unsigned count);
+void set_object_refs(struct object *obj, struct object_refs *refs);
 
 void mark_reachable(struct object *obj, unsigned int mask);
 
 struct object_list *object_list_insert(struct object *item, 
                                       struct object_list **list_p);
 
+void object_list_append(struct object *item,
+                       struct object_list **list_p);
+
 unsigned object_list_length(struct object_list *list);
 
 int object_list_contains(struct object_list *list, struct object *obj);