Merge branch 'jc/lockfile' into next

diff --git a/object.h b/object.h
index d82c7c454bfc64e75b74f03c2d34d3f7e778a0f1..e08afbd29ff04cf463a4aacdc4fe141a2ab54ce6 100644 (file)
--- a/object.h
+++ b/object.h
@@ -7,17 +7,23 @@ struct object_list {
        const char *name;
 };
 
+struct object_refs {
+       unsigned count;
+       struct object *ref[FLEX_ARRAY]; /* more */
+};
+
 struct object {
        unsigned parsed : 1;
        unsigned used : 1;
        unsigned int flags;
        unsigned char sha1[20];
        const char *type;
-       struct object_list *refs;
+       struct object_refs *refs;
        void *util;
 };
 
-extern int nr_objs;
+extern int track_object_refs;
+extern int obj_allocs;
 extern struct object **objs;
 
 /** Internal only **/
@@ -31,8 +37,22 @@ void created_object(const unsigned char *sha1, struct object *obj);
 /** Returns the object, having parsed it to find out what it is. **/
 struct object *parse_object(const unsigned char *sha1);
 
-void add_ref(struct object *refer, struct object *target);
+/** Returns the object, with potentially excess memory allocated. **/
+struct object *lookup_unknown_object(const unsigned  char *sha1);
+
+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);
+
 #endif /* OBJECT_H */