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-apply.c | |
| parent | 664a3348b22bd5fe5d2d97b9985edeaf3a34cb71 (diff) | |
| parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 (diff) | |
| download | git-36dd9393938d4e7f8843c6c587c9b4db077377fc.tar.gz | |
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-apply.c')
| -rw-r--r-- | builtin-apply.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 6d5a60214c..b415daf07e 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1258,8 +1258,9 @@ static char *inflate_it(const void *data, unsigned long size, stream.avail_in = size; stream.next_out = out = xmalloc(inflated_size); stream.avail_out = inflated_size; - inflateInit(&stream); - st = inflate(&stream, Z_FINISH); + git_inflate_init(&stream); + st = git_inflate(&stream, Z_FINISH); + git_inflate_end(&stream); if ((st != Z_STREAM_END) || stream.total_out != inflated_size) { free(out); return NULL; |