Re: [PATCH 01/11] packed_object_info_detail(): do not return a string
- From
Thiago Farina <tfransosi@gmail.com>
- Date
- May 17, 2011, 00:45 UTC
- Message-ID
- <BANLkTinxfNH85v6AfWaVNRzhP-fJ0tjNNg@mail.gmail.com>
- 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:
Show 36 quoted lines
> 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.
Show 33 quoted lines
> > /* 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 >