alloc: add repository argument to alloc_blob_node

stefanbeller · gitster · commit f0de1d62ae59 · 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
@@ -49,7 +49,7 @@ static inline void *alloc_node(struct alloc_state *s, size_t node_size)
 }
 
 static struct alloc_state blob_state;
-void *alloc_blob_node(void)
+void *alloc_blob_node_the_repository(void)
 {
 	struct blob *b = alloc_node(&blob_state, sizeof(struct blob));
 	b->object.type = OBJ_BLOB;
diff --git a/blob.c b/blob.c
@@ -9,7 +9,7 @@ struct blob *lookup_blob(const struct object_id *oid)
 	struct object *obj = lookup_object(oid->hash);
 	if (!obj)
 		return create_object(the_repository, oid->hash,
-				     alloc_blob_node());
+				     alloc_blob_node(the_repository));
 	return object_as_type(obj, OBJ_BLOB, 0);
 }
 
diff --git a/cache.h b/cache.h
@@ -1764,7 +1764,8 @@ int decode_85(char *dst, const char *line, int linelen);
 void encode_85(char *buf, const unsigned char *data, int bytes);
 
 /* alloc.c */
-extern void *alloc_blob_node(void);
+#define alloc_blob_node(r) alloc_blob_node_##r()
+extern void *alloc_blob_node_the_repository(void);
 extern void *alloc_tree_node(void);
 extern void *alloc_commit_node(void);
 extern void *alloc_tag_node(void);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static inline void alloc_node(struct alloc_state s, size_t node_size)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`static struct alloc_state blob_state;`
`52`		`-void *alloc_blob_node(void)`
	`52`	`+void *alloc_blob_node_the_repository(void)`
`53`	`53`	`{`
`54`	`54`	`struct blob *b = alloc_node(&blob_state, sizeof(struct blob));`
`55`	`55`	`b->object.type = OBJ_BLOB;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ struct blob lookup_blob(const struct object_id oid)`
`9`	`9`	`struct object *obj = lookup_object(oid->hash);`
`10`	`10`	`if (!obj)`
`11`	`11`	`return create_object(the_repository, oid->hash,`
`12`		`- alloc_blob_node());`
	`12`	`+ alloc_blob_node(the_repository));`
`13`	`13`	`return object_as_type(obj, OBJ_BLOB, 0);`
`14`	`14`	`}`
`15`	`15`