diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:04 -0700 |
| commit | eb4f4076aa89d38221ee513a5f28f22124029c90 (patch) | |
| tree | 8617f31f2dada1ec300dff9427f92ba00ea95500 /pack-check.c | |
| parent | d37b2991b1edea76c01ec05cc383005b55c96e36 (diff) | |
| parent | e01503b523e79748ac91d876f506811c597d03cb (diff) | |
| download | git-eb4f4076aa89d38221ee513a5f28f22124029c90.tar.gz | |
Merge branch 'jc/zlib-wrap'
* jc/zlib-wrap:
zlib: allow feeding more than 4GB in one go
zlib: zlib can only process 4GB at a time
zlib: wrap deflateBound() too
zlib: wrap deflate side of the API
zlib: wrap inflateInit2 used to accept only for gzip format
zlib: wrap remaining calls to direct inflate/inflateEnd
zlib wrapper: refactor error message formatter
Conflicts:
sha1_file.c
Diffstat (limited to 'pack-check.c')
| -rw-r--r-- | pack-check.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pack-check.c b/pack-check.c index a1a521648d..0c19b6e5a5 100644 --- a/pack-check.c +++ b/pack-check.c @@ -26,7 +26,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs, uint32_t data_crc = crc32(0, NULL, 0); do { - unsigned int avail; + unsigned long avail; void *data = use_pack(p, w_curs, offset, &avail); if (avail > len) avail = len; @@ -61,7 +61,7 @@ static int verify_packfile(struct packed_git *p, git_SHA1_Init(&ctx); do { - unsigned int remaining; + unsigned long remaining; unsigned char *in = use_pack(p, w_curs, offset, &remaining); offset += remaining; if (!pack_sig_ofs) |