From 69c2cdb45c43d841b8bde91e434f6b2a4490795a Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Thu, 14 Jul 2016 16:52:45 +0200
Subject: [PATCH] fixed conversion warning

---
 lib/compress/zstd_compress.c | 19 +++++++++++++------
 lib/dictBuilder/zdict.c      |  3 +--
 programs/paramgrill.c        |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c
index 15a79d705..a53c172f6 100644
--- a/lib/compress/zstd_compress.c
+++ b/lib/compress/zstd_compress.c
@@ -152,7 +152,7 @@ ZSTD_CCtx* ZSTD_createCCtx(void)
 
 ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
 {
-    ZSTD_CCtx* ctx;
+    ZSTD_CCtx* cctx;
 
     if (!customMem.customAlloc && !customMem.customFree)
         customMem = defaultCustomMem;
@@ -160,11 +160,11 @@ ZSTD_CCtx* ZSTD_createCCtx_advanced(ZSTD_customMem customMem)
     if (!customMem.customAlloc || !customMem.customFree)
         return NULL;
 
-    ctx = (ZSTD_CCtx*) customMem.customAlloc(customMem.opaque, sizeof(ZSTD_CCtx));
-    if (!ctx) return NULL;
-    memset(ctx, 0, sizeof(ZSTD_CCtx));
-    memcpy(&ctx->customMem, &customMem, sizeof(ZSTD_customMem));
-    return ctx;
+    cctx = (ZSTD_CCtx*) customMem.customAlloc(customMem.opaque, sizeof(ZSTD_CCtx));
+    if (!cctx) return NULL;
+    memset(cctx, 0, sizeof(ZSTD_CCtx));
+    memcpy(&(cctx->customMem), &customMem, sizeof(ZSTD_customMem));
+    return cctx;
 }
 
 size_t ZSTD_freeCCtx(ZSTD_CCtx* cctx)
@@ -2321,8 +2321,15 @@ _storeSequence:
     /* Save reps for next block */
     ctx->savedRep[0] = offset_1; ctx->savedRep[1] = offset_2;
 
+    static unsigned nbBlocks = 0;
+    printf("nbBlocks : %u \n", ++nbBlocks);
+    if (nbBlocks == 185)
+        printf("@");
+
     /* Last Literals */
     {   size_t const lastLLSize = iend - anchor;
+        if (lastLLSize == 4181)
+            printf("~");
         memcpy(seqStorePtr->lit, anchor, lastLLSize);
         seqStorePtr->lit += lastLLSize;
     }
diff --git a/lib/dictBuilder/zdict.c b/lib/dictBuilder/zdict.c
index 5ae49456b..44dca8d2d 100644
--- a/lib/dictBuilder/zdict.c
+++ b/lib/dictBuilder/zdict.c
@@ -710,8 +710,7 @@ static size_t ZDICT_analyzeEntropy(void*  dstBuffer, size_t maxDstSize,
             goto _cleanup;
     }
     if (compressionLevel==0) compressionLevel=g_compressionLevel_default;
-    params.cParams = ZSTD_getCParams(compressionLevel, averageSampleSize, dictBufferSize);
-    params.fParams.contentSizeFlag = 0;
+    params = ZSTD_getParams(compressionLevel, averageSampleSize, dictBufferSize);
 	{	size_t const beginResult = ZSTD_compressBegin_advanced(esr.ref, dictBuffer, dictBufferSize, params, 0);
 		if (ZSTD_isError(beginResult)) {
 			eSize = ERROR(GENERIC);
diff --git a/programs/paramgrill.c b/programs/paramgrill.c
index da49cf36f..3e5d4ba7b 100644
--- a/programs/paramgrill.c
+++ b/programs/paramgrill.c
@@ -222,7 +222,7 @@ static size_t BMK_benchParam(BMK_result_t* resultPtr,
         double fastestC = 100000000., fastestD = 100000000.;
         double ratio = 0.;
         U64 crcCheck = 0;
-        time_t const benchStart = clock();
+        clock_t const benchStart = clock();
 
         DISPLAY("\r%79s\r", "");
         memset(&params, 0, sizeof(params));