From 407a11f63e5bb68841ee7b7182bd558ea9472bf8 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 3 Nov 2016 15:52:01 -0700 Subject: [PATCH] fixed Visual compatibility --- .coverity.yml | 5 ----- lib/compress/zstd_compress.c | 3 +-- programs/zstdcli.c | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 .coverity.yml diff --git a/.coverity.yml b/.coverity.yml deleted file mode 100644 index 907f0960..00000000 --- a/.coverity.yml +++ /dev/null @@ -1,5 +0,0 @@ -configurationVersion: 1 - -filters: - # third-party embedded - - filePath: lib/dictBuilder/divsufsort.c diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c index 32059f84..d152d10d 100644 --- a/lib/compress/zstd_compress.c +++ b/lib/compress/zstd_compress.c @@ -2695,8 +2695,7 @@ size_t ZSTD_compress_advanced (ZSTD_CCtx* ctx, size_t ZSTD_compress_usingDict(ZSTD_CCtx* ctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize, const void* dict, size_t dictSize, int compressionLevel) { - if (!dict) dictSize = 0; - ZSTD_parameters params = ZSTD_getParams(compressionLevel, srcSize, dictSize); + ZSTD_parameters params = ZSTD_getParams(compressionLevel, srcSize, dict ? dictSize : 0); params.fParams.contentSizeFlag = 1; return ZSTD_compress_internal(ctx, dst, dstCapacity, src, srcSize, dict, dictSize, params); } diff --git a/programs/zstdcli.c b/programs/zstdcli.c index db4d6acc..38eef2b5 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -238,9 +238,9 @@ int main(int argCount, const char* argv[]) /* init */ (void)recursive; (void)cLevelLast; /* not used when ZSTD_NOBENCH set */ - (void)dictCLevel; (void)dictSelect; (void)dictID; /* not used when ZSTD_NODICT set */ - (void)cLevel; /* not used when ZSTD_NOCOMPRESS set */ - (void)ultra; (void)memLimit; /* not used when ZSTD_NODECOMPRESS set */ + (void)dictCLevel; (void)dictSelect; (void)dictID; (void)maxDictSize; /* not used when ZSTD_NODICT set */ + (void)ultra; (void)cLevel; /* not used when ZSTD_NOCOMPRESS set */ + (void)memLimit; /* not used when ZSTD_NODECOMPRESS set */ if (filenameTable==NULL) { DISPLAY("zstd: %s \n", strerror(errno)); exit(1); } filenameTable[0] = stdinmark; displayOut = stderr;