undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packed_object_info_detail(): do not return a string

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2011-05-12 16:50:29 -07:00
parent 02071b27f1
commit b9a62cbeb9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/verify-pack.c
View File

@ -33,9 +33,9 @@ static void show_pack_info(struct packed_git *p, unsigned int flags)
if (!sha1) if (!sha1)
die("internal error pack-check nth-packed-object"); die("internal error pack-check nth-packed-object");
offset = nth_packed_object_offset(p, i); 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, &delta_chain_length,
base_sha1); base_sha1));
if (!stat_only) if (!stat_only)
printf("%s ", sha1_to_hex(sha1)); printf("%s ", sha1_to_hex(sha1));
if (!delta_chain_length) { if (!delta_chain_length) {

2
cache.h
View File

@ -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 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 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 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 */ /* Dumb servers support */
extern int update_server_info(int); extern int update_server_info(int);

4
sha1_file.c
View File

@ -1549,7 +1549,7 @@ static int unpack_object_header(struct packed_git *p,
return type; 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, off_t obj_offset,
unsigned long *size, unsigned long *size,
unsigned long *store_size, unsigned long *store_size,
@ -1580,7 +1580,7 @@ const char *packed_object_info_detail(struct packed_git *p,
case OBJ_BLOB: case OBJ_BLOB:
case OBJ_TAG: case OBJ_TAG:
unuse_pack(&w_curs); unuse_pack(&w_curs);
return typename(type); return type;
case OBJ_OFS_DELTA: case OBJ_OFS_DELTA:
obj_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset); obj_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
if (!obj_offset) if (!obj_offset)