diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 18:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 18:01:00 -0800 |
| commit | 141b6b83d7ca5bd32d55a0a7e08384084d081557 (patch) | |
| tree | 5c0aea567c793844ba1568c77b3eb3bea2e6fe81 /builtin-pack-objects.c | |
| parent | cc91e1bd0537442339c4fd233b98a4b30e9dbe29 (diff) | |
| parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 (diff) | |
| download | git-141b6b83d7ca5bd32d55a0a7e08384084d081557.tar.gz | |
Merge branch 'lt/maint-wrap-zlib' into maint
* lt/maint-wrap-zlib:
Wrap inflate and other zlib routines for better error reporting
Conflicts:
http-push.c
http-walker.c
sha1_file.c
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index cedef52fd3..b616994f45 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -195,16 +195,16 @@ static int check_pack_inflate(struct packed_git *p, int st; memset(&stream, 0, sizeof(stream)); - inflateInit(&stream); + git_inflate_init(&stream); do { in = use_pack(p, w_curs, offset, &stream.avail_in); stream.next_in = in; stream.next_out = fakebuf; stream.avail_out = sizeof(fakebuf); - st = inflate(&stream, Z_FINISH); + st = git_inflate(&stream, Z_FINISH); offset += stream.next_in - in; } while (st == Z_OK || st == Z_BUF_ERROR); - inflateEnd(&stream); + git_inflate_end(&stream); return (st == Z_STREAM_END && stream.total_out == expect && stream.total_in == len) ? 0 : -1; |