summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:23:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-23 11:23:38 -0700
commita393c6bfd95e51ced65984de2a83a11490c4cfce (patch)
treea63f574f73cf1b0a359ffd7378daf628f9839d8e /builtin
parentMerge branch 'ak/git-done-help-cleanup' into maint (diff)
parentzlib: initialize git_zstream in git_deflate_init{,_gzip,_raw} (diff)
downloadtgif-a393c6bfd95e51ced65984de2a83a11490c4cfce.tar.xz
Merge branch 'rs/deflate-init-cleanup' into maint
Code simplification. * rs/deflate-init-cleanup: zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}
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 4632117671..cf654df09b 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1204,7 +1204,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 d8165878e1..c3a75166bd 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -125,7 +125,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);
@@ -153,7 +152,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 (;;) {