Use off_t when we really mean a file offset.
PATCH 7/9 Use off_t when we really mean a file offset.
Not all platforms have declared 'unsigned long' to be a 64 bit value, but we want to support a 64 bit packfile (or close enough anyway) in the near future as some projects are getting large enough that their packed size exceeds 4 GiB.
By using off_t, the POSIX type that is declared to mean an offset within a file, we support whatever maximum file size the underlying operating system will handle. For most modern systems this is up around 2^60 or higher.
Signed-off-by Shawn O. Pearce <[email protected]>
--- cache.h | 10 ++++---- fast-import.c | 4 --- git-compat-util.h | 4 +++ pack-check.c | 21 +++++++++++-------- pack-redundant.c | 8 +++--- sha1_file.c | 54 ++++++++++++++++++++++++++++------------------------ 6 files changed, 54 insertions(+), 47 deletions(-)
cache.h +5 -5
@@ -383,7 +383,7 @@ extern struct packed_git { } *packed_git;struct pack_entry { -unsigned int offset; +off_t offset;unsigned char sha1[20 ];struct packed_git *p; };
@@ -422,15 +422,15 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1, struct packed_git *packs);extern void pack_report (void ); -extern unsigned char *use_pack (struct packed_git *,struct pack_window **,unsigned long ,unsigned int *); +extern unsigned char *use_pack (struct packed_git *,struct pack_window **,off_t ,unsigned int *);extern void unuse_pack (struct pack_window **);extern struct packed_git *add_packed_git (char *,int ,int );extern uint32_t num_packed_objects (const struct packed_git *p);extern int nth_packed_object_sha1 (const struct packed_git *,uint32_t ,unsigned char *); -extern unsigned long find_pack_entry_one (const unsigned char *,struct packed_git *); -extern void *unpack_entry (struct packed_git *,unsigned long ,enum object_type *,unsigned long *); +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_gently (const unsigned char *buf,unsigned long len,enum object_type *type,unsigned long *sizep); -extern const char *packed_object_info_detail (struct packed_git *,unsigned long ,unsigned long *,unsigned long *,unsigned int *,unsigned char *); +extern const char *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 );
fast-import.c +0 -4
@@ -133,10 +133,6 @@ Format of STDIN stream:#define PACK_ID_BITS 16#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1) -#ifndef PRIuMAX -#define PRIuMAX "llu" -#endif -struct object_entry {struct object_entry *next;
git-compat-util.h +4 -0
@@ -70,6 +70,10 @@#define PATH_MAX 4096#endif +#ifndef PRIuMAX +#define PRIuMAX "llu" +#endif +#ifdef __GNUC__#define NORETURN __attribute__((__noreturn__))#else
pack-check.c +12 -9
@@ -4,11 +4,11 @@static int verify_packfile (struct packed_git *p,struct pack_window **w_curs) { -unsigned long index_size = p->index_size; +off_t index_size = p->index_size;void *index_base = p->index_base;SHA_CTX ctx;unsigned char sha1[20 ]; -unsigned long offset =0 , pack_sig = p->pack_size -20 ; +off_t offset =0 , pack_sig = p->pack_size -20 ;uint32_t nr_objects, i;int err;
@@ -24,7 +24,7 @@ static int verify_packfile(struct packed_git *p,unsigned char *in =use_pack (p, w_curs, offset, &remaining); offset += remaining;if (offset > pack_sig) - remaining -= offset - pack_sig; + remaining -= (unsigned int )(offset - pack_sig);SHA1_Update (&ctx, in, remaining); }SHA1_Final (sha1, &ctx);
@@ -45,7 +45,8 @@ static int verify_packfile(struct packed_git *p,unsigned char sha1[20 ];void *data;enum object_type type; -unsigned long size, offset; +unsigned long size; +off_t offset;if (nth_packed_object_sha1 (p, i, sha1))die ("internal error pack-check nth-packed-object" );
@@ -85,7 +86,7 @@ static void show_pack_info(struct packed_git *p)const char *type;unsigned long size;unsigned long store_size; -unsigned long offset; +off_t offset;unsigned int delta_chain_length;if (nth_packed_object_sha1 (p, i, sha1))
@@ -99,9 +100,11 @@ static void show_pack_info(struct packed_git *p) base_sha1);printf ("%s " ,sha1_to_hex (sha1));if (!delta_chain_length) -printf ("%-6s %lu %lu\n" , type, size, offset); +printf ("%-6s %lu %" PRIuMAX"\n" , + type, size, (uintmax_t )offset);else { -printf ("%-6s %lu %lu %u %s\n" , type, size, offset, +printf ("%-6s %lu %" PRIuMAX" %u %s\n" , + type, size, (uintmax_t )offset, delta_chain_length,sha1_to_hex (base_sha1));if (delta_chain_length <MAX_CHAIN ) chain_histogram[delta_chain_length]++;
@@ -123,7 +126,7 @@ static void show_pack_info(struct packed_git *p)int verify_pack (struct packed_git *p,int verbose) { -unsigned long index_size = p->index_size; +off_t index_size = p->index_size;void *index_base = p->index_base;SHA_CTX ctx;unsigned char sha1[20 ];
@@ -132,7 +135,7 @@ int verify_pack(struct packed_git *p, int verbose) ret =0 ;/* Verify SHA1 sum of the index file */ SHA1_Init (&ctx); -SHA1_Update (&ctx, index_base, index_size -20 ); +SHA1_Update (&ctx, index_base, (unsigned int )(index_size -20 ));SHA1_Final (sha1, &ctx);if (hashcmp (sha1, (unsigned char *)index_base + index_size -20 )) ret = error("Packfile index for %s SHA1 mismatch",
pack-redundant.c +4 -4
@@ -396,9 +396,9 @@ static size_t get_pack_redundancy(struct pack_list *pl)return ret; } -static inline size_t pack_set_bytecount (struct pack_list *pl) +static inline off_t pack_set_bytecount (struct pack_list *pl) { -size_t ret =0 ; +off_t ret =0 ;while (pl) { ret += pl->pack->pack_size; ret += pl->pack->index_size;
@@ -413,7 +413,7 @@ static void minimize(struct pack_list **min) *non_unique =NULL , *min_perm =NULL ;struct pll *perm, *perm_all, *perm_ok =NULL , *new_perm;struct llist *missing; -size_t min_perm_size = (size_t )-1 , perm_size; +off_t min_perm_size =0 , perm_size;int n; pl = local_packs;
@@ -461,7 +461,7 @@ static void minimize(struct pack_list **min) perm = perm_ok;while (perm) { perm_size =pack_set_bytecount (perm->pl); -if (min_perm_size > perm_size) { +if (!min_perm_size || min_perm_size > perm_size) { min_perm_size = perm_size; min_perm = perm->pl; }
sha1_file.c +29 -25
158 lines not on this page · raw message
Signature · 1 line
1.5.0.3.863.gf0989