From 9a691e0f55062156c2f5902405fe0d9b9394a9ab Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 31 May 2017 01:17:44 -0700 Subject: [PATCH] fixed visual warnings --- lib/common/zstd_internal.h | 1 + lib/compress/zstd_compress.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h index fedaac697..6f9b4ef1f 100644 --- a/lib/common/zstd_internal.h +++ b/lib/common/zstd_internal.h @@ -18,6 +18,7 @@ # include /* For Visual 2005 */ # pragma warning(disable : 4100) /* disable: C4100: unreferenced formal parameter */ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ +# pragma warning(disable : 4204) /* disable: C4204: non-constant aggregate initializer */ # pragma warning(disable : 4324) /* disable: C4324: padded structure */ #else # if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */ diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 90ee1bb6d..d57d909a7 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -3765,7 +3765,8 @@ size_t ZSTD_compress_generic_simpleArgs ( * @return : amount of data remaining to flush */ size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output) { - ZSTD_inBuffer input = { &input, 0, 0 }; + const char dummy[8] = {0}; + ZSTD_inBuffer input = { dummy, 0, 0 }; if (output->pos > output->size) return ERROR(GENERIC); CHECK_F( ZSTD_compressStream_generic(zcs, output, &input, ZSTD_e_flush) ); return zcs->outBuffContentSize - zcs->outBuffFlushedSize; /* remaining to flush */ @@ -3774,7 +3775,8 @@ size_t ZSTD_flushStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output) size_t ZSTD_endStream(ZSTD_CStream* zcs, ZSTD_outBuffer* output) { - ZSTD_inBuffer input = { &input, 0, 0 }; + const char dummy[8] = {0}; + ZSTD_inBuffer input = { dummy, 0, 0 }; if (output->pos > output->size) return ERROR(GENERIC); CHECK_F( ZSTD_compressStream_generic(zcs, output, &input, ZSTD_e_end) );