From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Jan 2008 07:26:09 +0000 (-0800)
Subject: pack-objects: remove redundant and wrong call to deflateEnd()
X-Git-Tag: v1.5.4-rc3~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c3c7b2adbac9d4fce1fcec0ca03cfb6535d5af3;p=git.git

pack-objects: remove redundant and wrong call to deflateEnd()

We somehow called deflateEnd() on a stream that we have called
deflateEnd() on already.

In fact, the second deflateEnd() has always been returning
Z_STREAM_ERROR.  We just never checked the error return from
that particular deflateEnd().

The first one returns 0 for success.  We might want to tighten
the check even more to check that.

Noticed by Marco.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index a39cb82c9..ec10238e4 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -445,7 +445,7 @@ static unsigned long write_object(struct sha1file *f,
 			/* nothing */;
 		deflateEnd(&stream);
 		datalen = stream.total_out;
-		deflateEnd(&stream);
+
 		/*
 		 * The object header is a byte of 'type' followed by zero or
 		 * more bytes of length.