summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2015-03-05 23:49:46 +0100
committerJunio C Hamano <gitster@pobox.com>2015-03-05 15:46:03 -0800
commit9a6f1287fb69c46c7895f987ffea558b13ae79d1 (patch)
tree1f1f46dcde359f6998f1dd7ce6d8d8f48894ff50 /fast-import.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-9a6f1287fb69c46c7895f987ffea558b13ae79d1.tar.gz
zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanup
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 'fast-import.c')
-rw-r--r--fast-import.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c
index fb4738d373..f757ef6b90 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1053,7 +1053,6 @@ static int store_object(
} else
delta = NULL;
- memset(&s, 0, sizeof(s));
git_deflate_init(&s, pack_compression_level);
if (delta) {
s.next_in = delta;
@@ -1081,7 +1080,6 @@ static int store_object(
free(delta);
delta = NULL;
- memset(&s, 0, sizeof(s));
git_deflate_init(&s, pack_compression_level);
s.next_in = (void *)dat->buf;
s.avail_in = dat->len;
@@ -1181,7 +1179,6 @@ static void stream_blob(uintmax_t len, unsigned char *sha1out, uintmax_t mark)
crc32_begin(pack_file);
- memset(&s, 0, sizeof(s));
git_deflate_init(&s, pack_compression_level);
hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);