undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2016-07-13 17:44:01 +02:00 committed by Junio C Hamano
parent 7171a0b0cf
commit fd3e67474c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/index-pack.c
View File

@ -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; va_list params;
char buf[1024]; char buf[1024];
@ -349,7 +349,8 @@ static NORETURN void bad_object(unsigned long offset, const char *format, ...)
va_start(params, format); va_start(params, format);
vsnprintf(buf, sizeof(buf), format, params); vsnprintf(buf, sizeof(buf), format, params);
va_end(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)