summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-05-08 12:37:31 -0700
committerJunio C Hamano <gitster@pobox.com>2018-05-09 12:12:36 +0900
commit13e3fdcb767fe860953f8c27eb1985bd5d15674d (patch)
treede55d100524e0b3c447336c14ef0e286c941b951
parenta0bd9086bb66fa8cb84bd4fac6441699121e1327 (diff)
downloadgit-13e3fdcb767fe860953f8c27eb1985bd5d15674d.tar.gz
alloc: add repository argument to alloc_object_node
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 <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--alloc.c2
-rw-r--r--cache.h3
-rw-r--r--object.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/alloc.c b/alloc.c
index 290250e359..f031ce422d 100644
--- 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
index 32f340cde5..2d60359a96 100644
--- 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
index 91edc30770..b8c3f923c5 100644
--- 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;
}