From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 01/12] packed_object_info_detail(): do not return a string
Date: Fri, 20 May 2011 23:56:24 -0700 [thread overview]
Message-ID: <1305960995-25738-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1305960995-25738-1-git-send-email-gitster@pobox.com>
Instead return an integer that can be given to typename() if
the caller wants a string, just like everybody else does.
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 *);
/* 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.2.369.g8fc017
next prev parent reply other threads:[~2011-05-21 6:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 6:56 [PATCH v3 00/12] writing out a huge blob to working tree Junio C Hamano
2011-05-21 6:56 ` Junio C Hamano [this message]
2011-05-21 6:56 ` [PATCH v3 02/12] sha1_object_info_extended(): expose a bit more info Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 03/12] sha1_object_info_extended(): hint about objects in delta-base cache Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 04/12] unpack_object_header(): make it public Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 05/12] write_entry(): separate two helper functions out Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 06/12] streaming: a new API to read from the object store Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 07/12] streaming_write_entry(): use streaming API in write_entry() Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 08/12] convert: CRLF_INPUT is a no-op in the output codepath Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 09/12] streaming_write_entry(): support files with holes Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 10/12] streaming: read non-delta incrementally from a pack Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 11/12] sha1_file.c: expose helpers to read loose objects Junio C Hamano
2011-05-21 6:56 ` [PATCH v3 12/12] streaming: read loose objects incrementally Junio C Hamano
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=1305960995-25738-2-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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).