From: Ramsay Jones <ramsay@ramsay1•demon.co.uk>
To: Jeff King <peff@peff•net>
Cc: Junio C Hamano <gitster@pobox•com>,
GIT Mailing-list <git@vger•kernel.org>
Subject: Re: [PATCH 2/7] move setting of object->type to alloc_* functions
Date: Sat, 12 Jul 2014 15:55:35 +0100 [thread overview]
Message-ID: <53C14C67.60300@ramsay1.demon.co.uk> (raw)
In-Reply-To: <20140711084611.GB5625@sigill.intra.peff.net>
On 11/07/14 09:46, Jeff King wrote:
[snip]
Sorry, hit send too early ...
> diff --git a/blob.c b/blob.c
> index ae320bd..5720a38 100644
> --- a/blob.c
> +++ b/blob.c
> @@ -7,7 +7,7 @@ struct blob *lookup_blob(const unsigned char *sha1)
> {
> struct object *obj = lookup_object(sha1);
> if (!obj)
> - return create_object(sha1, OBJ_BLOB, alloc_blob_node());
> + return create_object(sha1, alloc_blob_node());
> if (!obj->type)
> obj->type = OBJ_BLOB;
> if (obj->type != OBJ_BLOB) {
> diff --git a/builtin/blame.c b/builtin/blame.c
> index d3b256e..8f3e311 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -2287,7 +2287,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
> commit = alloc_commit_node();
> commit->object.parsed = 1;
> commit->date = now;
> - commit->object.type = OBJ_COMMIT;
> parent_tail = &commit->parents;
>
> if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL))
> diff --git a/commit.c b/commit.c
> index fb7897c..21ed310 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -63,7 +63,7 @@ struct commit *lookup_commit(const unsigned char *sha1)
> struct object *obj = lookup_object(sha1);
> if (!obj) {
> struct commit *c = alloc_commit_node();
> - return create_object(sha1, OBJ_COMMIT, c);
> + return create_object(sha1, c);
> }
perhaps:
if (!obj)
return create_object(sha1, alloc_commit_node());
(increasing similarity with other calls here ...)
> if (!obj->type)
> obj->type = OBJ_COMMIT;
> diff --git a/object.c b/object.c
> index 9c31e9a..a950b85 100644
> --- a/object.c
> +++ b/object.c
> @@ -141,13 +141,12 @@ static void grow_object_hash(void)
> obj_hash_size = new_hash_size;
> }
>
> -void *create_object(const unsigned char *sha1, int type, void *o)
> +void *create_object(const unsigned char *sha1, void *o)
> {
> struct object *obj = o;
>
> obj->parsed = 0;
> obj->used = 0;
> - obj->type = type;
> obj->flags = 0;
> hashcpy(obj->sha1, sha1);
>
> @@ -163,7 +162,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
> {
> struct object *obj = lookup_object(sha1);
> if (!obj)
> - obj = create_object(sha1, OBJ_NONE, alloc_object_node());
> + obj = create_object(sha1, alloc_object_node());
> return obj;
> }
>
> diff --git a/object.h b/object.h
> index 6e12f2c..8020ace 100644
> --- a/object.h
> +++ b/object.h
> @@ -79,7 +79,7 @@ extern struct object *get_indexed_object(unsigned int);
> */
> struct object *lookup_object(const unsigned char *sha1);
>
> -extern void *create_object(const unsigned char *sha1, int type, void *obj);
> +extern void *create_object(const unsigned char *sha1, void *obj);
>
> /*
> * Returns the object, having parsed it to find out what it is.
> diff --git a/tag.c b/tag.c
> index 7b07921..79552c7 100644
> --- a/tag.c
> +++ b/tag.c
> @@ -40,7 +40,7 @@ struct tag *lookup_tag(const unsigned char *sha1)
> {
> struct object *obj = lookup_object(sha1);
> if (!obj)
> - return create_object(sha1, OBJ_TAG, alloc_tag_node());
> + return create_object(sha1, alloc_tag_node());
> if (!obj->type)
> obj->type = OBJ_TAG;
> if (obj->type != OBJ_TAG) {
> diff --git a/tree.c b/tree.c
> index c8c49d7..ed66575 100644
> --- a/tree.c
> +++ b/tree.c
> @@ -183,7 +183,7 @@ struct tree *lookup_tree(const unsigned char *sha1)
> {
> struct object *obj = lookup_object(sha1);
> if (!obj)
> - return create_object(sha1, OBJ_TREE, alloc_tree_node());
> + return create_object(sha1, alloc_tree_node());
> if (!obj->type)
> obj->type = OBJ_TREE;
> if (obj->type != OBJ_TREE) {
>
ATB,
Ramsay Jones
next prev parent reply other threads:[~2014-07-12 14:55 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 23:59 [PATCH v3 2/2] alloc.c: remove the redundant commit_count variable Ramsay Jones
2014-07-11 0:30 ` Jeff King
2014-07-11 0:59 ` Ramsay Jones
2014-07-11 8:32 ` Jeff King
2014-07-11 9:41 ` Ramsay Jones
2014-07-11 8:41 ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Jeff King
2014-07-11 8:42 ` [PATCH 1/7] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-11 8:46 ` [PATCH 2/7] move setting of object->type to alloc_* functions Jeff King
2014-07-12 14:44 ` Ramsay Jones
2014-07-12 18:05 ` Jeff King
2014-07-13 6:41 ` Jeff King
2014-07-13 6:41 ` [PATCH v2 1/8] alloc.c: remove the alloc_raw_commit_node() function Jeff King
2014-07-15 20:06 ` Junio C Hamano
2014-07-13 6:41 ` [PATCH v2 2/8] alloc: write out allocator definitions Jeff King
2014-07-15 20:11 ` Junio C Hamano
2014-07-13 6:41 ` [PATCH v2 3/8] move setting of object->type to alloc_* functions Jeff King
2014-07-15 20:12 ` Junio C Hamano
2014-07-13 6:42 ` [PATCH v2 4/8] parse_object_buffer: do not set object type Jeff King
2014-07-13 6:42 ` [PATCH v2 5/8] add object_as_type helper for casting objects Jeff King
2014-07-13 6:42 ` [PATCH v2 6/8] alloc: factor out commit index Jeff King
2014-07-13 6:42 ` [PATCH v2 7/8] object_as_type: set " Jeff King
2014-07-13 6:42 ` [PATCH v2 8/8] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-13 19:27 ` [PATCH 2/7] move setting of object->type to alloc_* functions Ramsay Jones
2014-07-14 5:57 ` Jeff King
2014-07-14 11:03 ` Ramsay Jones
2014-07-12 14:55 ` Ramsay Jones [this message]
2014-07-12 18:07 ` Jeff King
2014-07-11 8:46 ` [PATCH 3/7] parse_object_buffer: do not set object type Jeff King
2014-07-11 8:48 ` [PATCH 4/7] add object_as_type helper for casting objects Jeff King
2014-07-11 10:45 ` Ramsay Jones
2014-07-11 16:59 ` Jeff King
2014-07-11 8:48 ` [PATCH 5/7] alloc: factor out commit index Jeff King
2014-07-11 8:49 ` [PATCH 6/7] object_as_type: set " Jeff King
2014-07-11 8:50 ` [PATCH 7/7] diff-tree: avoid lookup_unknown_object Jeff King
2014-07-11 10:31 ` [PATCH 0/7] ensure index is set for all OBJ_COMMIT objects variable Ramsay Jones
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53C14C67.60300@ramsay1.demon.co.uk \
--to=ramsay@ramsay1$(echo .)demon.co.uk \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox