From: Yann Collet Date: Sun, 31 Jan 2016 23:03:10 +0000 (+0100) Subject: fixed clang warnings X-Git-Tag: v0.5.0~1^2~3^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35c4648bf73dcedf95a4a2117a97f28b2aefb84;p=thirdparty%2Fzstd.git fixed clang warnings --- diff --git a/dictBuilder/dictBuilder.c b/dictBuilder/dictBuilder.c index 944853fbb..d8b2bdb30 100644 --- a/dictBuilder/dictBuilder.c +++ b/dictBuilder/dictBuilder.c @@ -856,7 +856,7 @@ static size_t DiB_trainFromBuffer_internal( const void* samplesBuffer, const size_t* sampleSizes, unsigned nbSamples, DiB_params_t params) { - const U32 dictListSize = MAX( MAX(DICTLISTSIZE, nbSamples), maxDictSize/16); + const U32 dictListSize = MAX( MAX(DICTLISTSIZE, nbSamples), (U32)(maxDictSize/16)); dictItem* dictList = (dictItem*)malloc(dictListSize * sizeof(*dictList)); unsigned selectivity = params.selectivityLevel; unsigned compressionLevel = params.compressionLevel; @@ -879,7 +879,7 @@ static size_t DiB_trainFromBuffer_internal( DiB_trainBuffer(dictList, dictListSize, samplesBuffer, sBuffSize, sampleSizes, nbSamples, - selectivity, targetDictSize); + selectivity, (U32)targetDictSize); /* display best matches */ if (g_displayLevel>= 3) { @@ -918,7 +918,7 @@ static size_t DiB_trainFromBuffer_internal( if (selectivity==1) { /* note could also be used to complete a dictionary, but not necessarily better */ DISPLAYLEVEL(3, "\r%70s\r", ""); /* clean display line */ DISPLAYLEVEL(3, "Adding %u KB with fast sampling \n", (U32)(targetDictSize>>10)); - dictContentSize = DiB_fastSampling((char*)dictBuffer + g_provision_entropySize, + dictContentSize = (U32)DiB_fastSampling((char*)dictBuffer + g_provision_entropySize, targetDictSize, samplesBuffer, sBuffSize); }