From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 30 Mar 2016 18:06:26 +0000 (+0200)
Subject: fixed clang conversion warning
X-Git-Tag: v0.6.0^2~17^2~28^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd6466a2111af5c657db8b0961dc83c128bbadb7;p=thirdparty%2Fzstd.git

fixed clang conversion warning
---

diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c
index 53e52b0cc..714b3ceb5 100644
--- a/lib/zstd_compress.c
+++ b/lib/zstd_compress.c
@@ -176,13 +176,13 @@ size_t ZSTD_checkCParams_advanced(ZSTD_compressionParameters cParams, U64 srcSiz
     Both `srcSize` and `dictSize` are optional (use 0 if unknown),
     but if both are 0, no optimization can be done.
     Note : params is considered validated at this stage. Use ZSTD_checkParams() to ensure that. */
-void ZSTD_adjustCParams(ZSTD_compressionParameters* params, size_t srcSize, size_t dictSize)
+void ZSTD_adjustCParams(ZSTD_compressionParameters* params, U64 srcSize, size_t dictSize)
 {
     if (srcSize+dictSize == 0) return;   /* no size information available : no adjustment */
 
     /* resize params, to use less memory when necessary */
-    {   size_t const minSrcSize = (srcSize==0) ? 500 : 0;
-        size_t const rSize = srcSize + dictSize + minSrcSize;
+    {   U32 const minSrcSize = (srcSize==0) ? 500 : 0;
+        U64 const rSize = srcSize + dictSize + minSrcSize;
         if (rSize < (1<<ZSTD_WINDOWLOG_MAX)) {
             U32 const srcLog = ZSTD_highbit((U32)(rSize)-1) + 1;
             if (params->windowLog > srcLog) params->windowLog = srcLog;
diff --git a/lib/zstd_static.h b/lib/zstd_static.h
index d9eda9b88..350859f79 100644
--- a/lib/zstd_static.h
+++ b/lib/zstd_static.h
@@ -110,7 +110,7 @@ ZSTDLIB_API size_t ZSTD_checkCParams(ZSTD_compressionParameters params);
 /*! ZSTD_adjustParams() :
 *   optimize params for a given `srcSize` and `dictSize`.
 *   both values are optional, select `0` if unknown. */
-ZSTDLIB_API void ZSTD_adjustCParams(ZSTD_compressionParameters* params, size_t srcSize, size_t dictSize);
+ZSTDLIB_API void ZSTD_adjustCParams(ZSTD_compressionParameters* params, U64 srcSize, size_t dictSize);
 
 /*! ZSTD_compress_advanced() :
 *   Same as ZSTD_compress_usingDict(), with fine-tune control of each compression parameter */