]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
fixed compilation warning : declaration-after-statement
authorYann Collet <cyan@fb.com>
Thu, 27 Apr 2017 08:10:36 +0000 (01:10 -0700)
committerYann Collet <cyan@fb.com>
Thu, 27 Apr 2017 08:11:26 +0000 (01:11 -0700)
lib/common/zstd_internal.h
lib/compress/zstd_compress.c

index 559d8bec65bd299b0253d95a578ac5588d5d93a1..9bcb40ffcc2bba00c73ecc9ebb52dff468047822 100644 (file)
 #ifdef _MSC_VER    /* Visual Studio */
 #  define FORCE_INLINE static __forceinline
 #  include <intrin.h>                    /* 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 */
-#  pragma warning(disable : 4100)        /* disable: C4100: unreferenced formal parameter */
 #else
 #  if defined (__cplusplus) || defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L   /* C99 */
 #    ifdef __GNUC__
index 5daa555420ac7b188e2434eb9f0f5591c959f5bd..1ed0715b4199780c41ba292a231607f1ae1520b7 100644 (file)
@@ -2975,9 +2975,7 @@ ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, u
         }
 
         {   ZSTD_frameParameters const fParams = { 0 /* contentSizeFlag */, 0 /* checksumFlag */, 0 /* noDictIDFlag */ };   /* dummy */
-            ZSTD_parameters params;
-            params.cParams = cParams;
-            params.fParams = fParams;
+            ZSTD_parameters const params = { cParams, fParams };
             size_t const errorCode = ZSTD_compressBegin_advanced(cctx, cdict->dictContent, dictSize, params, 0);
             if (ZSTD_isError(errorCode)) {
                 ZSTD_free(cdict->dictBuffer, customMem);