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 4/7] add object_as_type helper for casting objects
Date: Fri, 11 Jul 2014 11:45:58 +0100 [thread overview]
Message-ID: <53BFC066.2090102@ramsay1.demon.co.uk> (raw)
In-Reply-To: <20140711084823.GD5625@sigill.intra.peff.net>
On 11/07/14 09:48, Jeff King wrote:
[snip]
> diff --git a/object.c b/object.c
> index 472aa8d..b2319f6 100644
> --- a/object.c
> +++ b/object.c
> @@ -158,6 +158,23 @@ void *create_object(const unsigned char *sha1, void *o)
> return obj;
> }
>
> +void *object_as_type(struct object *obj, enum object_type type, int quiet)
> +{
> + if (obj->type == type)
> + return obj;
> + else if (obj->type == OBJ_NONE) {
> + obj->type = type;
> + return obj;
> + }
> + else {
> + if (!quiet)
> + error("object %s is a %s, not a %s",
> + sha1_to_hex(obj->sha1),
> + typename(obj->type), typename(type));
> + return NULL;
> + }
> +}
> +
> struct object *lookup_unknown_object(const unsigned char *sha1)
> {
> struct object *obj = lookup_object(sha1);
> diff --git a/object.h b/object.h
> index 8020ace..5e8d8ee 100644
> --- a/object.h
> +++ b/object.h
> @@ -81,6 +81,8 @@ struct object *lookup_object(const unsigned char *sha1);
>
> extern void *create_object(const unsigned char *sha1, void *obj);
>
> +void *object_as_type(struct object *obj, enum object_type type, int quiet);
> +
> /*
> * Returns the object, having parsed it to find out what it is.
> *
> diff --git a/refs.c b/refs.c
> index 20e2bf1..5a18e2d 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1729,9 +1729,8 @@ static enum peel_status peel_object(const unsigned char *name, unsigned char *sh
>
> if (o->type == OBJ_NONE) {
> int type = sha1_object_info(name, NULL);
> - if (type < 0)
> + if (type < 0 || !object_as_type(o, type, 0))
--------------------------------------------------------^^^
It is not possible here for object_as_type() to issue an error()
report, but I had to go look at the code to check. (It would have
been a change in behaviour, otherwise). So, it doesn't really matter
what you pass to the quiet argument, but setting it to 1 _may_ help
the next reader. (No, I'm not convinced either; the only reason I
knew it had anything to do with error messages was because I had
just read the code ...) Hmm, dunno.
> return PEEL_INVALID;
> - o->type = type;
> }
>
> if (o->type != OBJ_TAG)
> diff --git a/tag.c b/tag.c
> index 79552c7..82d841b 100644
> --- a/tag.c
> +++ b/tag.c
> @@ -41,14 +41,7 @@ struct tag *lookup_tag(const unsigned char *sha1)
> struct object *obj = lookup_object(sha1);
> if (!obj)
> return create_object(sha1, alloc_tag_node());
> - if (!obj->type)
> - obj->type = OBJ_TAG;
> - if (obj->type != OBJ_TAG) {
> - error("Object %s is a %s, not a tag",
> - sha1_to_hex(sha1), typename(obj->type));
> - return NULL;
> - }
> - return (struct tag *) obj;
> + return object_as_type(obj, OBJ_TAG, 0);
> }
>
> static unsigned long parse_tag_date(const char *buf, const char *tail)
> diff --git a/tree.c b/tree.c
> index ed66575..bb02c1c 100644
> --- a/tree.c
> +++ b/tree.c
> @@ -184,14 +184,7 @@ struct tree *lookup_tree(const unsigned char *sha1)
> struct object *obj = lookup_object(sha1);
> if (!obj)
> return create_object(sha1, alloc_tree_node());
> - if (!obj->type)
> - obj->type = OBJ_TREE;
> - if (obj->type != OBJ_TREE) {
> - error("Object %s is a %s, not a tree",
> - sha1_to_hex(sha1), typename(obj->type));
> - return NULL;
> - }
> - return (struct tree *) obj;
> + return object_as_type(obj, OBJ_TREE, 0);
> }
>
> int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
>
ATB,
Ramsay Jones
next prev parent reply other threads:[~2014-07-11 10:46 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
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 [this message]
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=53BFC066.2090102@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