Re: [PATCH 04/35] object: add repository argument to parse_object_buffer

> Add a repository argument to allow the callers of parse_object_buffer
> to be more specific about which repository to act on. This is a small
> mechanical change; it doesn't change the implementation to handle
> repositories other than the_repository yet.
>
> As with the previous commits, use a macro to catch callers passing a
> repository other than the_repository at compile time.
>
> Add the cocci patch that converted the callers.

> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>   builtin/fast-export.c    | 3 ++-
>   builtin/fsck.c           | 6 ++++--
>   builtin/index-pack.c     | 3 ++-
>   builtin/unpack-objects.c | 3 ++-
>   object.c                 | 5 +++--
>   object.h                 | 3 ++-
>   ref-filter.c             | 3 ++-
>   7 files changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 24d42842f9d..a34ab9768f4 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -245,7 +245,8 @@ static void export_blob(const struct object_id *oid)
>   			die ("Could not read blob %s", oid_to_hex(oid));
>   		if (check_object_signature(oid, buf, size, type_name(type)) < 0)
>   			die("sha1 mismatch in blob %s", oid_to_hex(oid));
> -		object = parse_object_buffer(oid, type, size, buf, &eaten);
> +		object = parse_object_buffer(the_repository, oid, type,
> +					     size, buf, &eaten);
>   	}
>   
>   	if (!object)
> diff --git a/builtin/fsck.c b/builtin/fsck.c
> index 700739804fc..e6d6eb266eb 100644
> --- a/builtin/fsck.c
> +++ b/builtin/fsck.c
> @@ -392,7 +392,8 @@ static int fsck_obj_buffer(const struct object_id *oid, enum object_type type,
>   	 * verify_packfile(), data_valid variable for details.
>   	 */
>   	struct object *obj;
> -	obj = parse_object_buffer(oid, type, size, buffer, eaten);
> +	obj = parse_object_buffer(the_repository, oid, type, size, buffer,
> +				  eaten);
>   	if (!obj) {
>   		errors_found |= ERROR_OBJECT;
>   		return error("%s: object corrupt or missing", oid_to_hex(oid));
> @@ -522,7 +523,8 @@ static struct object *parse_loose_object(const struct object_id *oid,
>   	if (!contents && type != OBJ_BLOB)
>   		die("BUG: read_loose_object streamed a non-blob");
>   
> -	obj = parse_object_buffer(oid, type, size, contents, &eaten);
> +	obj = parse_object_buffer(the_repository, oid, type, size,
> +				  contents, &eaten);
>   
>   	if (!eaten)
>   		free(contents);
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index e2f670bef9e..0dd10693597 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -848,7 +848,8 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
>   			 * we do not need to free the memory here, as the
>   			 * buf is deleted by the caller.
>   			 */
> -			obj = parse_object_buffer(oid, type, size, buf,
> +			obj = parse_object_buffer(the_repository, oid, type,
> +						  size, buf,
>   						  &eaten);
>   			if (!obj)
>   				die(_("invalid %s"), type_name(type));
> diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
> index 9a4d2708123..8e454c48649 100644
> --- a/builtin/unpack-objects.c
> +++ b/builtin/unpack-objects.c
> @@ -265,7 +265,8 @@ static void write_object(unsigned nr, enum object_type type,
>   		int eaten;
>   		hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
>   		added_object(nr, type, buf, size);
> -		obj = parse_object_buffer(&obj_list[nr].oid, type, size, buf,
> +		obj = parse_object_buffer(the_repository, &obj_list[nr].oid,
> +					  type, size, buf,
>   					  &eaten);
>   		if (!obj)
>   			die("invalid %s", type_name(type));
> diff --git a/object.c b/object.c
> index def3c71cac2..4250ddd3f7f 100644
> --- a/object.c
> +++ b/object.c
> @@ -186,7 +186,7 @@ struct object *lookup_unknown_object_the_repository(const unsigned char *sha1)
>   	return obj;
>   }
>   
> -struct object *parse_object_buffer(const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
> +struct object *parse_object_buffer_the_repository(const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p)
>   {
>   	struct object *obj;
>   	*eaten_p = 0;
> @@ -278,7 +278,8 @@ struct object *parse_object_the_repository(const struct object_id *oid)
>   			return NULL;
>   		}
>   
> -		obj = parse_object_buffer(oid, type, size, buffer, &eaten);
> +		obj = parse_object_buffer(the_repository, oid, type, size,
> +					  buffer, &eaten);
>   		if (!eaten)
>   			free(buffer);
>   		return obj;
> diff --git a/object.h b/object.h
> index 778f83bf0f7..c6386d7b6b1 100644
> --- a/object.h
> +++ b/object.h
> @@ -136,7 +136,8 @@ struct object *parse_object_or_die(const struct object_id *oid, const char *name
>    * parsing it.  eaten_p indicates if the object has a borrowed copy
>    * of buffer and the caller should not free() it.
>    */
> -struct object *parse_object_buffer(const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
> +#define parse_object_buffer(r, o, t, s, b, e) parse_object_buffer_##r(o, t, s, b, e)
> +struct object *parse_object_buffer_the_repository(const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
>   
>   /** Returns the object, with potentially excess memory allocated. **/
>   #define lookup_unknown_object(r, s) lookup_unknown_object_##r(s)
> diff --git a/ref-filter.c b/ref-filter.c
> index 6ebb4630f9c..7e57c07bf54 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -806,7 +806,8 @@ static void *get_obj(const struct object_id *oid, struct object **obj, unsigned
>   	void *buf = read_object_file(oid, &type, sz);
>   
>   	if (buf)
> -		*obj = parse_object_buffer(oid, type, *sz, buf, eaten);
> +		*obj = parse_object_buffer(the_repository, oid, type, *sz,
> +					   buf, eaten);
>   	else
>   		*obj = NULL;
>   	return buf;