git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 04/35] object: add repository argument to parse_object_buffer
Date: Wed, 30 May 2018 14:34:17 -0400	[thread overview]
Message-ID: <e6651365-dd04-98dd-10b7-867bebcc4e27@gmail.com> (raw)
In-Reply-To: <20180530004810.30076-5-sbeller@google.com>

On 5/29/2018 8:47 PM, Stefan Beller wrote:
> 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.

Again, I'm missing the cocci patch here.


> 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;

  reply	other threads:[~2018-05-30 18:34 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-30  0:47 [RFC PATCH 00/35] object-store: lookup_commit Stefan Beller
2018-05-30  0:47 ` [PATCH 01/35] object: add repository argument to parse_object Stefan Beller
2018-05-30  0:47 ` [PATCH 02/35] object: add repository argument to lookup_object Stefan Beller
2018-05-30  0:47 ` [PATCH 03/35] object: add repository argument to lookup_unknown_object Stefan Beller
2018-05-30 18:29   ` Derrick Stolee
2018-06-06 19:38   ` Duy Nguyen
2018-06-13 19:30     ` Stefan Beller
2018-06-14  1:17       ` Derrick Stolee
2018-05-30  0:47 ` [PATCH 04/35] object: add repository argument to parse_object_buffer Stefan Beller
2018-05-30 18:34   ` Derrick Stolee [this message]
2018-05-30  0:47 ` [PATCH 05/35] object: add repository argument to object_as_type Stefan Beller
2018-05-30  0:47 ` [PATCH 06/35] blob: add repository argument to lookup_blob Stefan Beller
2018-05-30 18:36   ` Derrick Stolee
2018-05-30  0:47 ` [PATCH 07/35] tree: add repository argument to lookup_tree Stefan Beller
2018-06-06 19:26   ` Duy Nguyen
2018-05-30  0:47 ` [PATCH 08/35] commit: add repository argument to lookup_commit_reference_gently Stefan Beller
2018-05-30  0:47 ` [PATCH 09/35] commit: add repository argument to lookup_commit_reference Stefan Beller
2018-05-30  0:47 ` [PATCH 10/35] commit: add repository argument to lookup_commit Stefan Beller
2018-06-14 16:22   ` Duy Nguyen
2018-06-14 21:15     ` Stefan Beller
2018-06-14 21:24       ` Brandon Williams
2018-05-30  0:47 ` [PATCH 11/35] commit: add repository argument to parse_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 12/35] commit: add repository argument to set_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 13/35] commit: add repository argument to get_cached_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 14/35] tag: add repository argument to lookup_tag Stefan Beller
2018-05-30  0:47 ` [PATCH 15/35] tag: add repository argument to parse_tag_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 16/35] tag: add repository argument to deref_tag Stefan Beller
2018-05-30  0:47 ` [PATCH 17/35] object: add repository argument to parse_commit_gently Stefan Beller
2018-05-30  0:47 ` [PATCH 18/35] commit: add repository argument to parse_commit Stefan Beller
2018-05-30  0:47 ` [PATCH 19/35] object: allow object_as_type to handle arbitrary repositories Stefan Beller
2018-05-30  0:47 ` [PATCH 20/35] object: allow lookup_object " Stefan Beller
2018-05-30  0:47 ` [PATCH 21/35] blob: allow lookup_blob " Stefan Beller
2018-05-30  0:47 ` [PATCH 22/35] tree: allow lookup_tree " Stefan Beller
2018-05-30  0:47 ` [PATCH 23/35] commit: allow lookup_commit " Stefan Beller
2018-05-30  0:47 ` [PATCH 24/35] tag: allow lookup_tag " Stefan Beller
2018-05-30  0:48 ` [PATCH 25/35] tag: allow parse_tag_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 26/35] commit.c: allow parse_commit_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 27/35] commit-slabs: remove realloc counter outside of slab struct Stefan Beller
2018-05-30 19:00   ` Derrick Stolee
2018-05-30  0:48 ` [PATCH 28/35] commit.c: migrate the commit buffer to the parsed object store Stefan Beller
2018-06-06 19:31   ` Duy Nguyen
2018-06-13 20:55     ` Stefan Beller
2018-05-30  0:48 ` [PATCH 29/35] commit.c: allow set_commit_buffer to handle arbitrary repositories Stefan Beller
2018-05-30  0:48 ` [PATCH 30/35] commit.c: allow get_cached_commit_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 31/35] object.c: allow parse_object_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 32/35] object.c: allow parse_object " Stefan Beller
2018-05-30  0:48 ` [PATCH 33/35] tag.c: allow deref_tag " Stefan Beller
2018-05-30  0:48 ` [PATCH 34/35] commit.c: allow lookup_commit_reference_gently " Stefan Beller
2018-05-30  0:48 ` [PATCH 35/35] commit.c: allow lookup_commit_reference " Stefan Beller
2018-05-30  1:05 ` [RFC PATCH 00/35] object-store: lookup_commit Derrick Stolee
2018-05-30  3:18   ` Stefan Beller
2018-05-30 19:18     ` Derrick Stolee
2018-05-30 22:19       ` Stefan Beller
2018-06-13 23:04 ` [PATCH v2 00/31] " Stefan Beller
2018-06-13 23:04   ` [PATCH v2 01/31] object: add repository argument to lookup_object Stefan Beller
2018-06-13 23:04   ` [PATCH v2 02/31] object: add repository argument to parse_object_buffer Stefan Beller
2018-06-13 23:04   ` [PATCH v2 03/31] object: add repository argument to object_as_type Stefan Beller
2018-06-13 23:04   ` [PATCH v2 04/31] blob: add repository argument to lookup_blob Stefan Beller
2018-06-13 23:04   ` [PATCH v2 05/31] tree: add repository argument to lookup_tree Stefan Beller
2018-06-14 17:55     ` Derrick Stolee
2018-06-14 19:33       ` Derrick Stolee
2018-06-14 21:31         ` Stefan Beller
2018-06-13 23:04   ` [PATCH v2 06/31] commit: add repository argument to lookup_commit_reference_gently Stefan Beller
2018-06-13 23:04   ` [PATCH v2 07/31] commit: add repository argument to lookup_commit_reference Stefan Beller
2018-06-13 23:04   ` [PATCH v2 08/31] commit: add repository argument to lookup_commit Stefan Beller
2018-06-13 23:05   ` [PATCH v2 09/31] commit: add repository argument to parse_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 10/31] commit: add repository argument to set_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 11/31] commit: add repository argument to get_cached_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 12/31] tag: add repository argument to lookup_tag Stefan Beller
2018-06-13 23:05   ` [PATCH v2 13/31] tag: add repository argument to parse_tag_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 14/31] tag: add repository argument to deref_tag Stefan Beller
2018-06-13 23:05   ` [PATCH v2 15/31] object: allow object_as_type to handle arbitrary repositories Stefan Beller
2018-06-13 23:05   ` [PATCH v2 16/31] object: allow lookup_object " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 17/31] blob: allow lookup_blob " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 18/31] tree: allow lookup_tree " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 19/31] commit: allow lookup_commit " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 20/31] tag: allow lookup_tag " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 21/31] tag: allow parse_tag_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 22/31] commit.c: allow parse_commit_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 23/31] commit-slabs: remove realloc counter outside of slab struct Stefan Beller
2018-06-13 23:05   ` [PATCH v2 24/31] commit.c: migrate the commit buffer to the parsed object store Stefan Beller
2018-06-13 23:05   ` [PATCH v2 25/31] commit.c: allow set_commit_buffer to handle arbitrary repositories Stefan Beller
2018-06-13 23:05   ` [PATCH v2 26/31] commit.c: allow get_cached_commit_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 27/31] object.c: allow parse_object_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 28/31] object.c: allow parse_object " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 29/31] tag.c: allow deref_tag " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 30/31] commit.c: allow lookup_commit_reference_gently " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 31/31] commit.c: allow lookup_commit_reference " Stefan Beller
2018-06-14  1:23   ` [PATCH v2 00/31] object-store: lookup_commit Derrick Stolee
2018-06-14  1:42     ` Derrick Stolee
2018-06-14 16:26   ` Duy Nguyen
2018-06-14 18:27   ` Brandon Williams

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e6651365-dd04-98dd-10b7-867bebcc4e27@gmail.com \
    --to=stolee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).