contrib/subtree: fix broken &&-chains and revealed test error

diff --git a/archive-zip.c b/archive-zip.c
index 0f9e87f46e5d80846287df1039e1815eb2947067..ffb3535e93dca2135724d998657b80c2bc4d6f20 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -122,7 +122,6 @@ static void *zlib_deflate_raw(void *data, unsigned long size,
        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);
@@ -367,7 +366,6 @@ static int write_zip_entry(struct archiver_args *args,
                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;