Browse Source

packed objects: minor cleanup

The delta depth is unsigned.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
f8f135c9ba
  1. 2
      cache.h
  2. 4
      pack-check.c
  3. 4
      sha1_file.c

2
cache.h

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

4
pack-check.c

@ -84,7 +84,7 @@ static void show_pack_info(struct packed_git *p)
char type[20]; char type[20];
unsigned long size; unsigned long size;
unsigned long store_size; unsigned long store_size;
int delta_chain_length; unsigned int delta_chain_length;


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



4
sha1_file.c

@ -830,7 +830,7 @@ void packed_object_info_detail(struct pack_entry *e,
char *type, char *type,
unsigned long *size, unsigned long *size,
unsigned long *store_size, unsigned long *store_size,
int *delta_chain_length, unsigned int *delta_chain_length,
unsigned char *base_sha1) unsigned char *base_sha1)
{ {
struct packed_git *p = e->p; struct packed_git *p = e->p;
@ -844,7 +844,7 @@ void packed_object_info_detail(struct pack_entry *e,
if (kind != OBJ_DELTA) if (kind != OBJ_DELTA)
*delta_chain_length = 0; *delta_chain_length = 0;
else { else {
int chain_length = 0; unsigned int chain_length = 0;
memcpy(base_sha1, pack, 20); memcpy(base_sha1, pack, 20);
do { do {
struct pack_entry base_ent; struct pack_entry base_ent;

Loading…
Cancel
Save