diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 16:55:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 16:55:17 -0800 |
| commit | 36dd9393938d4e7f8843c6c587c9b4db077377fc (patch) | |
| tree | 068987295f97b419452a69d3c15b82882a9e1582 /builtin-pack-objects.c | |
| parent | 664a3348b22bd5fe5d2d97b9985edeaf3a34cb71 (diff) | |
| parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 (diff) | |
| download | git-36dd9393938d4e7f8843c6c587c9b4db077377fc.tar.gz git-36dd9393938d4e7f8843c6c587c9b4db077377fc.tar.xz | |
Merge branch 'lt/maint-wrap-zlib'
* 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 e8515348b..cb51916fe 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; |