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>

diff --git a/archive-zip.c b/archive-zip.c
index 4bde019bce632703d4e336d6404693487cdbcdfb..1a54e1b187178e9818ee3e3f90279c2985fa7b63 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -120,7 +120,6 @@ static void *zlib_deflate_raw(void *data, unsigned long size,
        void *buffer;
        int result;
 
        void *buffer;
        int result;
 

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init_raw(&stream, compression_level);
        maxsize = git_deflate_bound(&stream, size);
        buffer = xmalloc(maxsize);
        git_deflate_init_raw(&stream, compression_level);
        maxsize = git_deflate_bound(&stream, size);
        buffer = xmalloc(maxsize);


@@ -349,7 +348,6 @@ static int write_zip_entry(struct archiver_args *args,
                size_t out_len;
                unsigned char compressed[STREAM_BUFFER_SIZE * 2];
 
                size_t out_len;
                unsigned char compressed[STREAM_BUFFER_SIZE * 2];
 

-               memset(&zstream, 0, sizeof(zstream));

                git_deflate_init_raw(&zstream, args->compression_level);
 
                compressed_size = 0;
                git_deflate_init_raw(&zstream, args->compression_level);
 
                compressed_size = 0;

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 9ca0203922ba41139ad8daa9672acd22602bc1b5..1239a10d0e197ee88faafc5f0e8982aeb6f64a5b 100644 (file)
--- 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];
 
        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;
        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 de36c60ca11d248013c2de42d196f1aff8a2937b..1d1ed1b725ee4ece5129167f0a9a3a1315f00088 100644 (file)
--- 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;
 
        void *in, *out;
        unsigned long maxsize;
 

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init(&stream, pack_compression_level);
        maxsize = git_deflate_bound(&stream, size);
 
        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;
 
        unsigned char obuf[1024 * 16];
        unsigned long olen = 0;
 

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init(&stream, pack_compression_level);
 
        for (;;) {
        git_deflate_init(&stream, pack_compression_level);
 
        for (;;) {

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 98e651c284254b3c96c59b4f444cbc0f54edd90e..136b704627d38b45c889568d009cd10d96bb3747 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -104,7 +104,6 @@ static int stream_to_pack(struct bulk_checkin_state *state,
        int write_object = (flags & HASH_WRITE_OBJECT);
        off_t offset = 0;
 
        int write_object = (flags & HASH_WRITE_OBJECT);
        off_t offset = 0;
 

-       memset(&s, 0, sizeof(s));

        git_deflate_init(&s, pack_compression_level);
 
        hdrlen = encode_in_pack_object_header(type, size, obuf);
        git_deflate_init(&s, pack_compression_level);
 
        hdrlen = encode_in_pack_object_header(type, size, obuf);

diff --git a/diff.c b/diff.c
index 3f1f08f9fd28173e10440c8436d57c14215c342c..c90cf72e0af68d9942e92d3d635fddfb975f05b8 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2091,7 +2091,6 @@ static unsigned char *deflate_it(char *data,
        unsigned char *deflated;
        git_zstream stream;
 
        unsigned char *deflated;
        git_zstream stream;
 

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init(&stream, zlib_compression_level);
        bound = git_deflate_bound(&stream, size);
        deflated = xmalloc(bound);
        git_deflate_init(&stream, zlib_compression_level);
        bound = git_deflate_bound(&stream, size);
        deflated = xmalloc(bound);

diff --git a/fast-import.c b/fast-import.c
index fb4738d373a5a1048c2ff388a729e6088515ca9b..f757ef6b90a16794e64894683977cda15df92ca7 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1053,7 +1053,6 @@ static int store_object(
        } else
                delta = NULL;
 
        } else
                delta = NULL;
 

-       memset(&s, 0, sizeof(s));

        git_deflate_init(&s, pack_compression_level);
        if (delta) {
                s.next_in = delta;
        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;
 
                        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;
                        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);
 
 
        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);
        git_deflate_init(&s, pack_compression_level);
 
        hdrlen = encode_in_pack_object_header(OBJ_BLOB, len, out_buf);

diff --git a/http-push.c b/http-push.c
index bc94a3f6abeb3ddaa9d926fa051f740f691f6e6e..8f473b35de30bda806354c90a37c02ffba9c00cc 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -365,7 +365,6 @@ static void start_put(struct transfer_request *request)
        hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
 
        /* Set it up */
        hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1;
 
        /* Set it up */

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init(&stream, zlib_compression_level);
        size = git_deflate_bound(&stream, len + hdrlen);
        strbuf_init(&request->buffer.buf, size);
        git_deflate_init(&stream, zlib_compression_level);
        size = git_deflate_bound(&stream, len + hdrlen);
        strbuf_init(&request->buffer.buf, size);

diff --git a/remote-curl.c b/remote-curl.c
index 52c2d96ce6183ca8b3498794304fa8dc98f8f42a..13c639c632eb96ed559aee97239b387eccc5f9e3 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -555,7 +555,6 @@ static int post_rpc(struct rpc_state *rpc)
                git_zstream stream;
                int ret;
 
                git_zstream stream;
                int ret;
 

-               memset(&stream, 0, sizeof(stream));

                git_deflate_init_gzip(&stream, Z_BEST_COMPRESSION);
                gzip_size = git_deflate_bound(&stream, rpc->len);
                gzip_body = xmalloc(gzip_size);
                git_deflate_init_gzip(&stream, Z_BEST_COMPRESSION);
                gzip_size = git_deflate_bound(&stream, rpc->len);
                gzip_body = xmalloc(gzip_size);

diff --git a/sha1_file.c b/sha1_file.c
index a38854ce553c1e59294d5542a37a5404ccd66dc5..634c4ac3028f7dceb63fee9ba560f17b57cab55a 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2916,7 +2916,6 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
        }
 
        /* Set it up */
        }
 
        /* Set it up */

-       memset(&stream, 0, sizeof(stream));

        git_deflate_init(&stream, zlib_compression_level);
        stream.next_out = compressed;
        stream.avail_out = sizeof(compressed);
        git_deflate_init(&stream, zlib_compression_level);
        stream.next_out = compressed;
        stream.avail_out = sizeof(compressed);

diff --git a/zlib.c b/zlib.c
index 61e6df0fdce6dfaf38da7af996d7fe801db8f00c..4223f1a8c57a281d5e41c329a4f983a7bb3b57a0 100644 (file)
--- a/zlib.c
+++ b/zlib.c
@@ -159,6 +159,7 @@ void git_deflate_init(git_zstream *strm, int level)
 {
        int status;
 
 {
        int status;
 

+       memset(strm, 0, sizeof(*strm));

        zlib_pre_call(strm);
        status = deflateInit(&strm->z, level);
        zlib_post_call(strm);
        zlib_pre_call(strm);
        status = deflateInit(&strm->z, level);
        zlib_post_call(strm);


@@ -172,6 +173,7 @@ static void do_git_deflate_init(git_zstream *strm, int level, int windowBits)
 {
        int status;
 
 {
        int status;
 

+       memset(strm, 0, sizeof(*strm));

        zlib_pre_call(strm);
        status = deflateInit2(&strm->z, level,
                                  Z_DEFLATED, windowBits,
        zlib_pre_call(strm);
        status = deflateInit2(&strm->z, level,
                                  Z_DEFLATED, windowBits,