From 04a9d6b8284a3761d30be58dc8dc18b89513794b Mon Sep 17 00:00:00 2001 From: Qin Li Date: Thu, 18 Jul 2019 11:44:59 -0700 Subject: [PATCH] fix compiling errors with clang-8 Compiling with clang-8 fails with the following errors: largeNbDicts.c:562:37: error: implicit conversion turns floating-point number into integer: 'const double' to 'U64' (aka 'unsigned long') [-Werror,-Wfloat-conversion] U64 const dTime_ns = result.nanoSecPerRun; ~~~~~~~~ ~~~~~~~^~~~~~~~~~~~~ zstdcli.c:300:5: error: '@return' command used in a comment that is not attached to a function or method declaration [-Werror,-Wdocumentation] * @return 1 means that cover parameters were correct ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ zstdcli.c:301:5: error: '@return' command used in a comment that is not attached to a function or method declaration [-Werror,-Wdocumentation] * @return 0 in case of malformed parameters ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- contrib/largeNbDicts/largeNbDicts.c | 2 +- programs/zstdcli.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/largeNbDicts/largeNbDicts.c b/contrib/largeNbDicts/largeNbDicts.c index dcc186b4..627a6910 100644 --- a/contrib/largeNbDicts/largeNbDicts.c +++ b/contrib/largeNbDicts/largeNbDicts.c @@ -559,7 +559,7 @@ static int benchMem(slice_collection_t dstBlocks, CONTROL(BMK_isSuccessful_runOutcome(outcome)); BMK_runTime_t const result = BMK_extract_runTime(outcome); - U64 const dTime_ns = result.nanoSecPerRun; + double const dTime_ns = result.nanoSecPerRun; double const dTime_sec = (double)dTime_ns / 1000000000; size_t const srcSize = result.sumOfReturn; double const dSpeed_MBps = (double)srcSize / dTime_sec / (1 MB); diff --git a/programs/zstdcli.c b/programs/zstdcli.c index a13c924c..de286cdf 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -294,13 +294,14 @@ static unsigned longCommandWArg(const char** stringPtr, const char* longCommand) #ifndef ZSTD_NODICT + +static const unsigned kDefaultRegression = 1; /** * parseCoverParameters() : * reads cover parameters from *stringPtr (e.g. "--train-cover=k=48,d=8,steps=32") into *params * @return 1 means that cover parameters were correct * @return 0 in case of malformed parameters */ -static const unsigned kDefaultRegression = 1; static unsigned parseCoverParameters(const char* stringPtr, ZDICT_cover_params_t* params) { memset(params, 0, sizeof(*params));