[PATCH 5/5] Use new decompress helpers in sha1_file.c

[PATCH 5/5] Use new decompress helpers in sha1_file.c

[Marco Costalba]

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
---
 sha1_file.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index 6583797..2a76043 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -7,6 +7,7 @@
  * creation etc.
  */
 #include "cache.h"
+#include "compress.h"
 #include "delta.h"
 #include "pack.h"
 #include "blob.h"
@@ -2086,25 +2087,19 @@ int write_sha1_file(void *buf, unsigned long
len, const char *type, unsigned cha
 	}

 	/* Set it up */
-	memset(&stream, 0, sizeof(stream));
-	deflateInit(&stream, zlib_compression_level);
-	size = 8 + deflateBound(&stream, len+hdrlen);
+	size = 8 + z_deflate_init(&stream, zlib_compression_level, len+hdrlen);
 	compressed = xmalloc(size);

 	/* Compress it */
-	stream.next_out = compressed;
-	stream.avail_out = size;
+	z_deflate_start(&stream, (unsigned char *)hdr, hdrlen, compressed, size);

 	/* First header.. */
-	stream.next_in = (unsigned char *)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 = buf;
 	stream.avail_in = len;
-	ret = deflate(&stream, Z_FINISH);
+	ret = z_deflate_next(&stream, Z_FINISH);
 	if (ret != Z_STREAM_END)
 		die("unable to deflate new object %s (%d)", sha1_to_hex(sha1), ret);

-- 
1.5.4.rc2.89.g1b3f