diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:55:17 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:55:17 +0300 |
commit | 36dd9393938d4e7f8843c6c587c9b4db077377fc (patch) | |
tree | 068987295f97b419452a69d3c15b82882a9e1582 /builtin-unpack-objects.c | |
parent | 664a3348b22bd5fe5d2d97b9985edeaf3a34cb71 (diff) | |
parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 (diff) |
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-unpack-objects.c')
-rw-r--r-- | builtin-unpack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c index 47ed610677f..9a773239cab 100644 --- a/builtin-unpack-objects.c +++ b/builtin-unpack-objects.c @@ -99,10 +99,10 @@ static void *get_data(unsigned long size) stream.avail_out = size; stream.next_in = fill(1); stream.avail_in = len; - inflateInit(&stream); + git_inflate_init(&stream); for (;;) { - int ret = inflate(&stream, 0); + int ret = git_inflate(&stream, 0); use(len - stream.avail_in); if (stream.total_out == size && ret == Z_STREAM_END) break; @@ -118,7 +118,7 @@ static void *get_data(unsigned long size) stream.next_in = fill(1); stream.avail_in = len; } - inflateEnd(&stream); + git_inflate_end(&stream); return buf; } |