index-pack: report correct bad object offsets even if they are large

Use the right type for offsets in this case, off_t, which makes a
difference on 32-bit systems with large file support, and change
formatting code accordingly.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index cafaab7b138efd4d06b0878b7e72416f55ebada2..e2d8ae4a0258e5a5625a2bbc515a4023a033f86b 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -338,10 +338,10 @@ static void parse_pack_header(void)
        use(sizeof(struct pack_header));
 }
 
        use(sizeof(struct pack_header));
 }
 

-static NORETURN void bad_object(unsigned long offset, const char *format,
+static NORETURN void bad_object(off_t offset, const char *format,

                       ...) __attribute__((format (printf, 2, 3)));
 
                       ...) __attribute__((format (printf, 2, 3)));
 

-static NORETURN void bad_object(unsigned long offset, const char *format, ...)
+static NORETURN void bad_object(off_t offset, const char *format, ...)

 {
        va_list params;
        char buf[1024];
 {
        va_list params;
        char buf[1024];


@@ -349,7 +349,8 @@ static NORETURN void bad_object(unsigned long offset, const char *format, ...)
        va_start(params, format);
        vsnprintf(buf, sizeof(buf), format, params);
        va_end(params);
        va_start(params, format);
        vsnprintf(buf, sizeof(buf), format, params);
        va_end(params);

-       die(_("pack has bad object at offset %lu: %s"), offset, buf);
+       die(_("pack has bad object at offset %"PRIuMAX": %s"),
+           (uintmax_t)offset, buf);

 }
 
 static inline struct thread_local *get_thread_data(void)
 }
 
 static inline struct thread_local *get_thread_data(void)