Skip to content

Commit

Permalink
packed objects: minor cleanup
Browse files Browse the repository at this point in the history
The delta depth is unsigned.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Feb 15, 2006
1 parent 6becd7d commit f8f135c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ extern int num_packed_objects(const struct packed_git *p);
extern int nth_packed_object_sha1(const struct packed_git *, int, unsigned char*);
extern int find_pack_entry_one(const unsigned char *, struct pack_entry *, struct packed_git *);
extern void *unpack_entry_gently(struct pack_entry *, char *, unsigned long *);
extern void packed_object_info_detail(struct pack_entry *, char *, unsigned long *, unsigned long *, int *, unsigned char *);
extern void packed_object_info_detail(struct pack_entry *, char *, unsigned long *, unsigned long *, unsigned int *, unsigned char *);

/* Dumb servers support */
extern int update_server_info(int);
Expand Down
4 changes: 2 additions & 2 deletions pack-check.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static void show_pack_info(struct packed_git *p)
char type[20];
unsigned long size;
unsigned long store_size;
int delta_chain_length;
unsigned int delta_chain_length;

if (nth_packed_object_sha1(p, i, sha1))
die("internal error pack-check nth-packed-object");
Expand All @@ -98,7 +98,7 @@ static void show_pack_info(struct packed_git *p)
if (!delta_chain_length)
printf("%-6s %lu %u\n", type, size, e.offset);
else
printf("%-6s %lu %u %d %s\n", type, size, e.offset,
printf("%-6s %lu %u %u %s\n", type, size, e.offset,
delta_chain_length, sha1_to_hex(base_sha1));
}

Expand Down
4 changes: 2 additions & 2 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ void packed_object_info_detail(struct pack_entry *e,
char *type,
unsigned long *size,
unsigned long *store_size,
int *delta_chain_length,
unsigned int *delta_chain_length,
unsigned char *base_sha1)
{
struct packed_git *p = e->p;
Expand All @@ -844,7 +844,7 @@ void packed_object_info_detail(struct pack_entry *e,
if (kind != OBJ_DELTA)
*delta_chain_length = 0;
else {
int chain_length = 0;
unsigned int chain_length = 0;
memcpy(base_sha1, pack, 20);
do {
struct pack_entry base_ent;
Expand Down

0 comments on commit f8f135c

Please sign in to comment.