packed objects: minor cleanup
authorJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 20:47:43 +0000 (12:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 21:03:27 +0000 (13:03 -0800)
The delta depth is unsigned.

Signed-off-by: Junio C Hamano <junkio@cox.net>
cache.h
pack-check.c
sha1_file.c

diff --git a/cache.h b/cache.h
index c255421ab96f1ca3ba1913e84d377ada003d04db..b5db01f28d9ac09fe016e1146e0e2b014373d0e9 100644 (file)
--- a/cache.h
+++ b/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 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);
index 67a7ecdf16a39000ffa9ed3453854607bc1e141d..eca32b6cabeaf8881abb9c93d9ca89fc556a937c 100644 (file)
@@ -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");
@@ -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));
        }
 
index 3d11a9bfdc56c00056c2057af5e6455742ab31f5..64cf2454182dbf4cbf1a2ee70dea4823cf8cfaa0 100644 (file)
@@ -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;
@@ -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;