alloc: add repository argument to alloc_blob_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>maint
parent
c077a4526b
commit
f0de1d62ae
2
alloc.c
2
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;
|
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));
|
struct blob *b = alloc_node(&blob_state, sizeof(struct blob));
|
||||||
b->object.type = OBJ_BLOB;
|
b->object.type = OBJ_BLOB;
|
||||||
|
|
2
blob.c
2
blob.c
|
@ -9,7 +9,7 @@ struct blob *lookup_blob(const struct object_id *oid)
|
||||||
struct object *obj = lookup_object(oid->hash);
|
struct object *obj = lookup_object(oid->hash);
|
||||||
if (!obj)
|
if (!obj)
|
||||||
return create_object(the_repository, oid->hash,
|
return create_object(the_repository, oid->hash,
|
||||||
alloc_blob_node());
|
alloc_blob_node(the_repository));
|
||||||
return object_as_type(obj, OBJ_BLOB, 0);
|
return object_as_type(obj, OBJ_BLOB, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
3
cache.h
3
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);
|
void encode_85(char *buf, const unsigned char *data, int bytes);
|
||||||
|
|
||||||
/* alloc.c */
|
/* 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_tree_node(void);
|
||||||
extern void *alloc_commit_node(void);
|
extern void *alloc_commit_node(void);
|
||||||
extern void *alloc_tag_node(void);
|
extern void *alloc_tag_node(void);
|
||||||
|
|
Loading…
Reference in New Issue