alloc: add repository argument to alloc_object_node

stefanbeller · gitster · commit 13e3fdcb767f · 2018-05-09T12:12:36.000+09:00
This is a small mechanical change; it doesn't change the
implementation to handle repositories other than the_repository yet.
Use a macro to catch callers passing a repository other than
the_repository at compile time.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/alloc.c b/alloc.c
@@ -73,7 +73,7 @@ void *alloc_tag_node_the_repository(void)
 }
 
 static struct alloc_state object_state;
-void *alloc_object_node(void)
+void *alloc_object_node_the_repository(void)
 {
 	struct object *obj = alloc_node(&object_state, sizeof(union any_object));
 	obj->type = OBJ_NONE;
diff --git a/cache.h b/cache.h
@@ -1772,7 +1772,8 @@ extern void *alloc_tree_node_the_repository(void);
 extern void *alloc_commit_node_the_repository(void);
 #define alloc_tag_node(r) alloc_tag_node_##r()
 extern void *alloc_tag_node_the_repository(void);
-extern void *alloc_object_node(void);
+#define alloc_object_node(r) alloc_object_node_##r()
+extern void *alloc_object_node_the_repository(void);
 extern void alloc_report(void);
 extern unsigned int alloc_commit_index(void);
 
diff --git a/object.c b/object.c
@@ -180,7 +180,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
 	struct object *obj = lookup_object(sha1);
 	if (!obj)
 		obj = create_object(the_repository, sha1,
-				    alloc_object_node());
+				    alloc_object_node(the_repository));
 	return obj;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void *alloc_tag_node_the_repository(void)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`static struct alloc_state object_state;`
`76`		`-void *alloc_object_node(void)`
	`76`	`+void *alloc_object_node_the_repository(void)`
`77`	`77`	`{`
`78`	`78`	`struct object *obj = alloc_node(&object_state, sizeof(union any_object));`
`79`	`79`	`obj->type = OBJ_NONE;`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ struct object lookup_unknown_object(const unsigned char sha1)`
`180`	`180`	`struct object *obj = lookup_object(sha1);`
`181`	`181`	`if (!obj)`
`182`	`182`	`obj = create_object(the_repository, sha1,`
`183`		`- alloc_object_node());`
	`183`	`+ alloc_object_node(the_repository));`
`184`	`184`	`return obj;`
`185`	`185`	`}`
`186`	`186`