summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2015-03-05 23:49:46 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-05 15:46:03 -0800
commit9a6f1287fb69c46c7895f987ffea558b13ae79d1 (patch)
tree1f1f46dcde359f6998f1dd7ce6d8d8f48894ff50 /builtin
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-9a6f1287fb69c46c7895f987ffea558b13ae79d1.tar.xz
zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
Clear the git_zstream variable at the start of git_deflate_init() etc. so that callers don't have to do that. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/index-pack.c1
-rw-r--r--builtin/pack-objects.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 9ca0203922..1239a10d0e 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1173,7 +1173,6 @@ static int write_compressed(struct sha1file *f, void *in, unsigned int size)
int status;
unsigned char outbuf[4096];
- memset(&stream, 0, sizeof(stream));
git_deflate_init(&stream, zlib_compression_level);
stream.next_in = in;
stream.avail_in = size;
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index de36c60ca1..1d1ed1b725 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -123,7 +123,6 @@ static unsigned long do_compress(void **pptr, unsigned long size)
void *in, *out;
unsigned long maxsize;
- memset(&stream, 0, sizeof(stream));
git_deflate_init(&stream, pack_compression_level);
maxsize = git_deflate_bound(&stream, size);
@@ -151,7 +150,6 @@ static unsigned long write_large_blob_data(struct git_istream *st, struct sha1fi
unsigned char obuf[1024 * 16];
unsigned long olen = 0;
- memset(&stream, 0, sizeof(stream));
git_deflate_init(&stream, pack_compression_level);
for (;;) {