From: Thiago Farina <tfransosi@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 01/11] packed_object_info_detail(): do not return a string
Date: Mon, 16 May 2011 21:45:09 -0300 [thread overview]
Message-ID: <BANLkTinxfNH85v6AfWaVNRzhP-fJ0tjNNg@mail.gmail.com> (raw)
In-Reply-To: <1305505831-31587-2-git-send-email-gitster@pobox.com>
On Sun, May 15, 2011 at 9:30 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Instead return enum object_name just like everybody else does.
> The caller can turn it into a string with typename() easily.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> builtin/verify-pack.c | 4 ++--
> cache.h | 2 +-
> sha1_file.c | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
> index b6079ae..3a919b1 100644
> --- a/builtin/verify-pack.c
> +++ b/builtin/verify-pack.c
> @@ -33,9 +33,9 @@ static void show_pack_info(struct packed_git *p, unsigned int flags)
> if (!sha1)
> die("internal error pack-check nth-packed-object");
> offset = nth_packed_object_offset(p, i);
> - type = packed_object_info_detail(p, offset, &size, &store_size,
> + type = typename(packed_object_info_detail(p, offset, &size, &store_size,
> &delta_chain_length,
> - base_sha1);
> + base_sha1));
> if (!stat_only)
> printf("%s ", sha1_to_hex(sha1));
> if (!delta_chain_length) {
> diff --git a/cache.h b/cache.h
> index b1b5bb5..cdb5112 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1020,7 +1020,7 @@ extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
> extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
> extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
> extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
> -extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
> +extern int packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
In the commit message you say to return "enum object_name". Maybe
change from int to enum object_name here and below?
Also, |type| below is enum object_type not object_name.
>
> /* Dumb servers support */
> extern int update_server_info(int);
> diff --git a/sha1_file.c b/sha1_file.c
> index 064a330..4f96eb1 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -1549,7 +1549,7 @@ static int unpack_object_header(struct packed_git *p,
> return type;
> }
>
> -const char *packed_object_info_detail(struct packed_git *p,
> +int packed_object_info_detail(struct packed_git *p,
> off_t obj_offset,
> unsigned long *size,
> unsigned long *store_size,
> @@ -1580,7 +1580,7 @@ const char *packed_object_info_detail(struct packed_git *p,
> case OBJ_BLOB:
> case OBJ_TAG:
> unuse_pack(&w_curs);
> - return typename(type);
> + return type;
> case OBJ_OFS_DELTA:
> obj_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
> if (!obj_offset)
> --
> 1.7.5.1.365.g32b65
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2011-05-17 0:45 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-16 0:30 [PATCH 00/11] writing out a huge blob to working tree Junio C Hamano
2011-05-16 0:30 ` [PATCH 01/11] packed_object_info_detail(): do not return a string Junio C Hamano
2011-05-17 0:45 ` Thiago Farina [this message]
2011-05-17 2:36 ` Junio C Hamano
2011-05-16 0:30 ` [PATCH 02/11] sha1_object_info_extended(): expose a bit more info Junio C Hamano
2011-05-16 0:30 ` [PATCH 03/11] sha1_object_info_extended(): hint about objects in delta-base cache Junio C Hamano
2011-05-16 0:40 ` Shawn Pearce
2011-05-16 0:30 ` [PATCH 04/11] unpack_object_header(): make it public Junio C Hamano
2011-05-16 0:30 ` [PATCH 05/11] write_entry(): separate two helper functions out Junio C Hamano
2011-05-16 0:30 ` [PATCH 06/11] streaming: a new API to read from the object store Junio C Hamano
2011-05-18 8:09 ` Jeff King
2011-05-19 1:52 ` Junio C Hamano
2011-05-16 0:30 ` [PATCH 07/11] streaming_write_entry(): use streaming API in write_entry() Junio C Hamano
2011-05-16 0:30 ` [PATCH 08/11] streaming_write_entry(): support files with holes Junio C Hamano
2011-05-16 10:53 ` Nguyen Thai Ngoc Duy
2011-05-16 14:39 ` Junio C Hamano
2011-05-17 1:18 ` Nguyen Thai Ngoc Duy
2011-05-17 5:23 ` Junio C Hamano
2011-05-16 13:03 ` Thiago Farina
2011-05-16 0:30 ` [PATCH 09/11] streaming: read non-delta incrementally from a pack Junio C Hamano
2011-05-16 0:58 ` Shawn Pearce
2011-05-16 5:00 ` Junio C Hamano
2011-05-16 0:30 ` [PATCH 10/11] sha1_file.c: expose helpers to read loose objects Junio C Hamano
2011-05-16 0:30 ` [PATCH 11/11] streaming: read loose objects incrementally Junio C Hamano
2011-05-16 0:47 ` [PATCH 00/11] writing out a huge blob to working tree Shawn Pearce
2011-05-18 6:41 ` Jeff King
2011-05-18 7:08 ` Jeff King
2011-05-18 7:50 ` Jeff King
2011-05-18 15:12 ` Junio C Hamano
2011-05-18 8:17 ` Jeff King
2011-05-19 21:33 ` [PATCH v2 " Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 01/11] packed_object_info_detail(): do not return a string Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 02/11] sha1_object_info_extended(): expose a bit more info Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 03/11] sha1_object_info_extended(): hint about objects in delta-base cache Junio C Hamano
2011-05-20 23:05 ` René Scharfe
2011-05-21 1:49 ` Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 04/11] unpack_object_header(): make it public Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 05/11] write_entry(): separate two helper functions out Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 06/11] streaming: a new API to read from the object store Junio C Hamano
2011-05-20 23:05 ` René Scharfe
2011-05-21 1:49 ` Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 07/11] streaming_write_entry(): use streaming API in write_entry() Junio C Hamano
2011-05-20 22:52 ` Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 08/11] streaming_write_entry(): support files with holes Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 09/11] streaming: read non-delta incrementally from a pack Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 10/11] sha1_file.c: expose helpers to read loose objects Junio C Hamano
2011-05-19 21:33 ` [PATCH v2 11/11] streaming: read loose objects incrementally Junio C Hamano
2011-05-19 21:44 ` [Not A PATCH v2 02/11] interdiff Junio C Hamano
2011-05-19 22:21 ` [PATCH v2 00/11] writing out a huge blob to working tree Jeff King
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=BANLkTinxfNH85v6AfWaVNRzhP-fJ0tjNNg@mail.gmail.com \
--to=tfransosi@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).