[PATCH 4/5] Use new decompress helpers in http-push.c
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
http-push.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/http-push.c b/http-push.c
index 55d0c94..03b2615 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "commit.h"
+#include "compress.h"
#include "pack.h"
#include "tag.h"
#include "blob.h"
@@ -491,27 +492,22 @@ static void start_put(struct transfer_request
hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
/* Set it up */
- memset(&stream, 0, sizeof(stream));
- deflateInit(&stream, zlib_compression_level);
- size = deflateBound(&stream, len + hdrlen);
+ size = z_deflate_init(&stream, zlib_compression_level, len + hdrlen);
strbuf_init(&request->buffer.buf, size);
request->buffer.posn = 0;
/* Compress it */
- stream.next_out = (unsigned char *)request->buffer.buf.buf;
- stream.avail_out = size;
+ z_deflate_start(&stream, (void *)hdr, hdrlen,
+ (unsigned char *)request->buffer.buf.buf, size);
/* First header.. */
- stream.next_in = (void *)hdr;
- stream.avail_in = hdrlen;
- while (deflate(&stream, 0) == Z_OK)
- /* nothing */;
+ z_deflate_next(&stream, Z_NO_FLUSH);
/* Then the data itself.. */
stream.next_in = unpacked;
stream.avail_in = len;
- while (deflate(&stream, Z_FINISH) == Z_OK)
- /* nothing */;
+ z_deflate_next(&stream, Z_FINISH);
+
deflateEnd(&stream);
free(unpacked);
--
1.5.4.rc2.89.g1b3f