From 91b30dbe847d8cad72b81de33e99dab650cb0f29 Mon Sep 17 00:00:00 2001 From: Stella Lau Date: Mon, 21 Aug 2017 10:09:06 -0700 Subject: [PATCH] Remove test parameter --- lib/common/zstd_internal.h | 40 ++++++------ lib/compress/zstd_compress.c | 108 ++++++++++++++------------------- lib/compress/zstdmt_compress.c | 12 ++-- lib/zstd.h | 26 +++++--- programs/fileio.c | 8 --- programs/fileio.h | 3 - programs/zstdcli.c | 3 - tests/Makefile | 2 +- tests/cctxParamRoundTrip.c | 25 ++++---- tests/zstreamtest.c | 7 --- 10 files changed, 98 insertions(+), 136 deletions(-) diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h index 8b8419a4..ee316418 100644 --- a/lib/common/zstd_internal.h +++ b/lib/common/zstd_internal.h @@ -236,27 +236,6 @@ typedef struct { U32 repToConfirm[ZSTD_REP_NUM]; } seqStore_t; -struct ZSTD_CCtx_params_s { - ZSTD_compressionParameters cParams; - ZSTD_frameParameters fParams; - - int compressionLevel; - U32 forceWindow; /* force back-references to respect limit of 1<seqStore); } - -/* TODO: get rid of this function if possible*/ -static ZSTD_CCtx_params ZSTD_makeCCtxParamsFromCParams( - ZSTD_compressionParameters cParams) -{ - ZSTD_CCtx_params cctxParams; - memset(&cctxParams, 0, sizeof(ZSTD_CCtx_params)); - cctxParams.cParams = cParams; - return cctxParams; -} - /* older variant; will be deprecated */ size_t ZSTD_setCCtxParameter(ZSTD_CCtx* cctx, ZSTD_CCtxParameter param, unsigned value) { @@ -239,7 +228,6 @@ size_t ZSTD_setCCtxParameter(ZSTD_CCtx* cctx, ZSTD_CCtxParameter param, unsigned } } - #define ZSTD_CLEVEL_CUSTOM 999 static void ZSTD_cLevelToCParams(ZSTD_CCtx* cctx) { @@ -250,6 +238,16 @@ static void ZSTD_cLevelToCParams(ZSTD_CCtx* cctx) cctx->requestedParams.compressionLevel = ZSTD_CLEVEL_CUSTOM; } +static ZSTD_CCtx_params ZSTD_makeCCtxParamsFromCParams( + ZSTD_compressionParameters cParams) +{ + ZSTD_CCtx_params cctxParams; + memset(&cctxParams, 0, sizeof(ZSTD_CCtx_params)); + cctxParams.cParams = cParams; + cctxParams.compressionLevel = ZSTD_CLEVEL_CUSTOM; + return cctxParams; +} + ZSTD_CCtx_params* ZSTD_createCCtxParams(void) { ZSTD_CCtx_params* params = @@ -287,10 +285,8 @@ size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params) static void ZSTD_cLevelToCCtxParams(ZSTD_CCtx_params* params) { if (params->compressionLevel == ZSTD_CLEVEL_CUSTOM) return; - // TODO: src size, code duplication params->cParams = ZSTD_getCParams(params->compressionLevel, 0, 0); params->compressionLevel = ZSTD_CLEVEL_CUSTOM; - } #define CLAMPCHECK(val,min,max) { \ @@ -305,7 +301,7 @@ size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned v switch(param) { case ZSTD_p_compressionLevel: - if (value == 0) return 0; + if (value == 0) return 0; /* special value : 0 means "don't change anything" */ if (cctx->cdict) return ERROR(stage_wrong); return ZSTD_CCtxParam_setParameter(&cctx->requestedParams, param, value); @@ -316,9 +312,9 @@ size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned v case ZSTD_p_minMatch: case ZSTD_p_targetLength: case ZSTD_p_compressionStrategy: - if (value == 0) return 0; /* special value : 0 means "don't change anything" */ + if (value == 0) return 0; if (cctx->cdict) return ERROR(stage_wrong); - ZSTD_cLevelToCParams(cctx); + ZSTD_cLevelToCParams(cctx); /* Can optimize if srcSize is known */ return ZSTD_CCtxParam_setParameter(&cctx->requestedParams, param, value); case ZSTD_p_contentSizeFlag: @@ -365,12 +361,6 @@ size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned v if (cctx->requestedParams.nbThreads <= 1) return ERROR(parameter_unsupported); assert(cctx->mtctx != NULL); return ZSTDMT_setMTCtxParameter(cctx->mtctx, ZSTDMT_p_overlapSectionLog, value); -#if 0 - case ZSTD_p_test : - DEBUGLOG(2, "Setting test parameter = %u", value); - cctx->requestedParams.testParam = (value > 0); - return 0; -#endif default: return ERROR(parameter_unsupported); } @@ -488,12 +478,6 @@ size_t ZSTD_CCtxParam_setParameter( if (params->nbThreads <= 1) { return ERROR(parameter_unsupported); } params->overlapSizeLog = value; return 0; -#if 0 - case ZSTD_p_test : - DEBUGLOG(2, "setting opaque: ZSTD_p_test: %u", value); - params->testParam = (value > 0); - return 0; -#endif default: return ERROR(parameter_unsupported); } @@ -525,10 +509,6 @@ static void ZSTD_debugPrintCCtxParams(ZSTD_CCtx_params* params) params->nbThreads, params->jobSize, params->overlapSizeLog); -#if 0 - DEBUGLOG(2, "testParam: %u", - params->testParam); -#endif } #endif @@ -537,6 +517,8 @@ static void ZSTD_debugPrintCCtxParams(ZSTD_CCtx_params* params) * Parameters are copied manually before the dictionary is loaded. * The multithreading parameters jobSize and overlapSizeLog are set only if * nbThreads >= 1. + * + * Pledged srcSize is treated as unknown. */ size_t ZSTD_CCtx_applyCCtxParams(ZSTD_CCtx* cctx, ZSTD_CCtx_params* params) { @@ -564,10 +546,6 @@ size_t ZSTD_CCtx_applyCCtxParams(ZSTD_CCtx* cctx, ZSTD_CCtx_params* params) cctx, ZSTD_p_overlapSizeLog, params->overlapSizeLog) ); } -#if 0 - /* Copy test parameter */ - cctx->requestedParams.testParam = params->testParam; -#endif return 0; } @@ -3748,7 +3726,6 @@ static ZSTD_CDict* ZSTD_createCDict_advanced_opaque( } } - ZSTD_CDict* ZSTD_createCDict_advanced(const void* dictBuffer, size_t dictSize, unsigned byReference, ZSTD_dictMode_e dictMode, ZSTD_compressionParameters cParams, ZSTD_customMem customMem) @@ -3791,32 +3768,36 @@ ZSTD_CDict* ZSTD_initStaticCDict_advanced_opaque( size_t dictSize, ZSTD_CCtx_params* params) { - size_t const cctxSize = ZSTD_estimateCCtxSize_advanced_opaque(params); - size_t const neededSize = sizeof(ZSTD_CDict) + (params->dictContentByRef ? 0 : dictSize) - + cctxSize; - ZSTD_CDict* const cdict = (ZSTD_CDict*) workspace; - void* ptr; - DEBUGLOG(5, "(size_t)workspace & 7 : %u", (U32)(size_t)workspace & 7); - if ((size_t)workspace & 7) return NULL; /* 8-aligned */ - DEBUGLOG(5, "(workspaceSize < neededSize) : (%u < %u) => %u", - (U32)workspaceSize, (U32)neededSize, (U32)(workspaceSize < neededSize)); - if (workspaceSize < neededSize) return NULL; + if (params == NULL) { return NULL; } + { ZSTD_CCtx_params cctxParams = *params; + size_t const cctxSize = ZSTD_estimateCCtxSize_advanced_opaque(params); + size_t const neededSize = sizeof(ZSTD_CDict) + + (cctxParams.dictContentByRef ? 0 : dictSize) + + cctxSize; + ZSTD_CDict* const cdict = (ZSTD_CDict*) workspace; + void* ptr; + DEBUGLOG(5, "(size_t)workspace & 7 : %u", (U32)(size_t)workspace & 7); + if ((size_t)workspace & 7) return NULL; /* 8-aligned */ + DEBUGLOG(5, "(workspaceSize < neededSize) : (%u < %u) => %u", + (U32)workspaceSize, (U32)neededSize, (U32)(workspaceSize < neededSize)); + if (workspaceSize < neededSize) return NULL; - if (!params->dictContentByRef) { - memcpy(cdict+1, dict, dictSize); - dict = cdict+1; - ptr = (char*)workspace + sizeof(ZSTD_CDict) + dictSize; - } else { - ptr = cdict+1; + if (!cctxParams.dictContentByRef) { + memcpy(cdict+1, dict, dictSize); + dict = cdict+1; + ptr = (char*)workspace + sizeof(ZSTD_CDict) + dictSize; + } else { + ptr = cdict+1; + } + cdict->refContext = ZSTD_initStaticCCtx(ptr, cctxSize); + cctxParams.dictContentByRef = 1; + + /* What if nbThreads > 1? */ + if (ZSTD_isError( ZSTD_initCDict_internal_opaque(cdict, dict, dictSize, cctxParams) )) + return NULL; + + return cdict; } - cdict->refContext = ZSTD_initStaticCCtx(ptr, cctxSize); - params->dictContentByRef = 1; - - /* What if nbThreads > 1? */ - if (ZSTD_isError( ZSTD_initCDict_internal_opaque(cdict, dict, dictSize, *params) )) - return NULL; - - return cdict; } /*! ZSTD_initStaticCDict_advanced() : @@ -3861,8 +3842,7 @@ size_t ZSTD_compressBegin_usingCDict_advanced( ZSTD_frameParameters const fParams, unsigned long long const pledgedSrcSize) { if (cdict==NULL) return ERROR(dictionary_wrong); - { - ZSTD_CCtx_params params = cdict->refContext->appliedParams; + { ZSTD_CCtx_params params = cdict->refContext->appliedParams; params.fParams = fParams; params.dictMode = ZSTD_dm_auto; DEBUGLOG(5, "ZSTD_compressBegin_usingCDict_advanced"); diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c index 76a062f0..84f42220 100644 --- a/lib/compress/zstdmt_compress.c +++ b/lib/compress/zstdmt_compress.c @@ -188,7 +188,8 @@ static void ZSTDMT_releaseBuffer(ZSTDMT_bufferPool* bufPool, buffer_t buf) /** * TODO - * Resets parameters to zero for jobs? + * + * Sets parameters to zero for jobs. Notably, nbThreads should be zero? */ static void ZSTDMT_zeroCCtxParams(ZSTD_CCtx_params* params) { @@ -564,7 +565,6 @@ static size_t ZSTDMT_compress_advanced_opaque( DEBUGLOG(4, "nbChunks : %2u (chunkSize : %u bytes) ", nbChunks, (U32)avgChunkSize); if (nbChunks==1) { /* fallback to single-thread mode */ ZSTD_CCtx* const cctx = mtctx->cctxPool->cctx[0]; - if (cdict) return ZSTD_compress_usingCDict_advanced(cctx, dst, dstCapacity, src, srcSize, cdict, cctxParams.fParams); return ZSTD_compress_advanced_opaque(cctx, dst, dstCapacity, src, srcSize, NULL, 0, requestedParams); } @@ -664,7 +664,6 @@ static size_t ZSTDMT_compress_advanced_opaque( if (!error) DEBUGLOG(4, "compressed size : %u ", (U32)dstPos); return error ? error : dstPos; } - } size_t ZSTDMT_compress_advanced(ZSTDMT_CCtx* mtctx, @@ -750,6 +749,7 @@ size_t ZSTDMT_initCStream_internal_opaque( if (dict) { DEBUGLOG(4,"cdictLocal: %08X", (U32)(size_t)zcs->cdictLocal); ZSTD_freeCDict(zcs->cdictLocal); + /* TODO: This will need a cctxParam version? */ zcs->cdictLocal = ZSTD_createCDict_advanced(dict, dictSize, 0 /* byRef */, ZSTD_dm_auto, /* note : a loadPrefix becomes an internal CDict */ params.cParams, zcs->cMem); @@ -779,12 +779,10 @@ size_t ZSTDMT_initCStream_internal_opaque( zcs->allJobsCompleted = 0; if (params.fParams.checksumFlag) XXH64_reset(&zcs->xxhState, 0); return 0; - } -/** ZSTDMT_initCStream_internal() : - * internal usage only */ -size_t ZSTDMT_initCStream_internal(ZSTDMT_CCtx* zcs, +/** ZSTDMT_initCStream_internal() */ +static size_t ZSTDMT_initCStream_internal(ZSTDMT_CCtx* zcs, const void* dict, size_t dictSize, const ZSTD_CDict* cdict, ZSTD_parameters params, unsigned long long pledgedSrcSize) { diff --git a/lib/zstd.h b/lib/zstd.h index f02f28c8..bbecd5ea 100644 --- a/lib/zstd.h +++ b/lib/zstd.h @@ -498,7 +498,7 @@ ZSTDLIB_API size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict); * It will also consider src size to be arbitrarily "large", which is worst case. * If srcSize is known to always be small, ZSTD_estimateCCtxSize_advanced() can provide a tighter estimation. * ZSTD_estimateCCtxSize_advanced() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel. - * TODO: ZSTD_estimateCCtxSize_advanced_opaque() + * ZSTD_estimateCCtxSize_advanced_opaque() can be used in tandem with ZSTD_CCtxParam_setParameter(). * Note : CCtx estimation is only correct for single-threaded compression */ ZSTDLIB_API size_t ZSTD_estimateCCtxSize(int compressionLevel); ZSTDLIB_API size_t ZSTD_estimateCCtxSize_advanced(ZSTD_compressionParameters cParams); @@ -510,7 +510,7 @@ ZSTDLIB_API size_t ZSTD_estimateDCtxSize(void); * It will also consider src size to be arbitrarily "large", which is worst case. * If srcSize is known to always be small, ZSTD_estimateCStreamSize_advanced() can provide a tighter estimation. * ZSTD_estimateCStreamSize_advanced() can be used in tandem with ZSTD_getCParams() to create cParams from compressionLevel. - * TODO: ZSTD_estimateCStreamSize_advanced_opaque() + * ZSTD_estimateCStreamSize_advanced_opaque() can be used in tandem with ZSTD_CCtxParam_setParameter(). * Note : CStream estimation is only correct for single-threaded compression. * ZSTD_DStream memory budget depends on window Size. * This information can be passed manually, using ZSTD_estimateDStreamSize, @@ -527,7 +527,7 @@ ZSTDLIB_API size_t ZSTD_estimateDStreamSize_fromFrame(const void* src, size_t sr /*! ZSTD_estimate?DictSize() : * ZSTD_estimateCDictSize() will bet that src size is relatively "small", and content is copied, like ZSTD_createCDict(). * ZSTD_estimateCStreamSize_advanced() makes it possible to control precisely compression parameters, like ZSTD_createCDict_advanced(). - * TODO: ZSTD_estimateCDictSize_advanced_opaque() + * ZSTD_estimateCDictSize_advanced_opaque() allows further compression parameters. ByReference can be set with ZSTD_CCtxParam_setParameter. * Note : dictionary created "byReference" are smaller */ ZSTDLIB_API size_t ZSTD_estimateCDictSize(size_t dictSize, int compressionLevel); ZSTDLIB_API size_t ZSTD_estimateCDictSize_advanced(size_t dictSize, ZSTD_compressionParameters cParams, unsigned byReference); @@ -613,7 +613,10 @@ ZSTDLIB_API ZSTD_CDict* ZSTD_initStaticCDict_advanced_opaque( const void* dict, size_t dictSize, ZSTD_CCtx_params* params); +/* TODO */ ZSTDLIB_API ZSTD_CCtx_params* ZSTD_createCCtxParams(void); +/*! ZSTD_resetCCtxParams() : + * Reset params to default, with the default compression level. */ ZSTDLIB_API size_t ZSTD_resetCCtxParams(ZSTD_CCtx_params* params); ZSTDLIB_API size_t ZSTD_initCCtxParams(ZSTD_CCtx_params* cctxParams, ZSTD_parameters params); ZSTDLIB_API size_t ZSTD_freeCCtxParams(ZSTD_CCtx_params* params); @@ -1000,9 +1003,6 @@ typedef enum { /* advanced parameters - may not remain available after API update */ ZSTD_p_forceMaxWindow=1100, /* Force back-reference distances to remain < windowSize, * even when referencing into Dictionary content (default:0) */ -#if 0 - ZSTD_p_test, -#endif } ZSTD_cParameter; @@ -1013,9 +1013,19 @@ typedef enum { * @result : 0, or an error code (which can be tested with ZSTD_isError()). */ ZSTDLIB_API size_t ZSTD_CCtx_setParameter(ZSTD_CCtx* cctx, ZSTD_cParameter param, unsigned value); -/* TODO */ +/*! ZSTD_CCtxParam_setParameter() : + * Similar to ZSTD_CCtx_setParameter. + * Set one compression parameter, selected by enum ZSTD_cParameter. + * Parameters must be applied to a ZSTD_CCtx using ZSTD_CCtx_applyCCtxParams(). + * Note : when `value` is an enum, cast it to unsigned for proper type checking. + * @result : 0, or an error code (which can be tested with ZSTD_isError()). */ ZSTDLIB_API size_t ZSTD_CCtxParam_setParameter(ZSTD_CCtx_params* params, ZSTD_cParameter param, unsigned value); -/* TODO */ + +/*! ZSTD_CCtx_applyCCtxParams() : + * Apply a set of ZSTD_CCtx_params to the compression context. + * This must be done before the dictionary is loaded. + * The pledgedSrcSize is treated as unknown. + * Multithreading parameters are applied only if nbThreads > 1. */ ZSTDLIB_API size_t ZSTD_CCtx_applyCCtxParams(ZSTD_CCtx* cctx, ZSTD_CCtx_params* params); /*! ZSTD_CCtx_setPledgedSrcSize() : diff --git a/programs/fileio.c b/programs/fileio.c index 1fb249d6..669052d8 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -213,10 +213,6 @@ void FIO_setOverlapLog(unsigned overlapLog){ DISPLAYLEVEL(2, "Setting overlapLog is useless in single-thread mode \n"); g_overlapLog = overlapLog; } -#if 0 -static U32 g_testParamFlag = 0; -void FIO_setTestParamFlag(unsigned testParamFlag) { g_testParamFlag = testParamFlag; } -#endif /*-************************************* * Functions @@ -414,10 +410,6 @@ static cRess_t FIO_createCResources(const char* dictFileName, int cLevel, CHECK( ZSTD_CCtx_setParameter(ress.cctx, ZSTD_p_nbThreads, g_nbThreads) ); /* dictionary */ CHECK( ZSTD_CCtx_loadDictionary(ress.cctx, dictBuffer, dictBuffSize) ); -#if 0 - /* Test */ - CHECK( ZSTD_CCtx_setParameter(ress.cctx, ZSTD_p_test, g_testParamFlag) ); -#endif } #elif defined(ZSTD_MULTITHREAD) { ZSTD_parameters params = ZSTD_getParams(cLevel, srcSize, dictBuffSize); diff --git a/programs/fileio.h b/programs/fileio.h index 497e122e..9d9167df 100644 --- a/programs/fileio.h +++ b/programs/fileio.h @@ -56,9 +56,6 @@ void FIO_setMemLimit(unsigned memLimit); void FIO_setNbThreads(unsigned nbThreads); void FIO_setBlockSize(unsigned blockSize); void FIO_setOverlapLog(unsigned overlapLog); -#if 0 -void FIO_setTestParamFlag(unsigned testParamFlag); -#endif /*-************************************* diff --git a/programs/zstdcli.c b/programs/zstdcli.c index 5e95e426..b1268c1f 100644 --- a/programs/zstdcli.c +++ b/programs/zstdcli.c @@ -430,9 +430,6 @@ int main(int argCount, const char* argv[]) if (!strcmp(argument, "--keep")) { FIO_setRemoveSrcFile(0); continue; } if (!strcmp(argument, "--rm")) { FIO_setRemoveSrcFile(1); continue; } if (!strcmp(argument, "--priority=rt")) { setRealTimePrio = 1; continue; } -#if 0 - if (!strcmp(argument, "--testParam")) { FIO_setTestParamFlag(1); continue; } -#endif #ifdef ZSTD_GZCOMPRESS if (!strcmp(argument, "--format=gzip")) { suffix = GZ_EXTENSION; FIO_setCompressionType(FIO_gzipCompression); continue; } #endif diff --git a/tests/Makefile b/tests/Makefile index e815f585..228f4cdd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -217,7 +217,7 @@ clean: fuzzer$(EXT) fuzzer32$(EXT) zbufftest$(EXT) zbufftest32$(EXT) \ fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT)\ zstreamtest$(EXT) zstreamtest32$(EXT) \ - datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \ + datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) cctxParamRoundTrip$(EXT) longmatch$(EXT) \ symbols$(EXT) invalidDictionaries$(EXT) legacy$(EXT) poolTests$(EXT) \ decodecorpus$(EXT) @echo Cleaning completed diff --git a/tests/cctxParamRoundTrip.c b/tests/cctxParamRoundTrip.c index 45a57a15..906ad9ce 100644 --- a/tests/cctxParamRoundTrip.c +++ b/tests/cctxParamRoundTrip.c @@ -32,6 +32,15 @@ *==========================================*/ #define MIN(a,b) ( (a) < (b) ? (a) : (b) ) +static void crash(int errorCode){ + /* abort if AFL/libfuzzer, exit otherwise */ + #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION /* could also use __AFL_COMPILER */ + abort(); + #else + exit(errorCode); + #endif +} + #define CHECK_Z(f) { \ size_t const err = f; \ if (ZSTD_isError(err)) { \ @@ -41,7 +50,6 @@ crash(1); \ } } - /** roundTripTest() : * Compresses `srcBuff` into `compressedBuff`, * then decompresses `compressedBuff` into `resultBuff`. @@ -61,10 +69,8 @@ static size_t roundTripTest(void* resultBuff, size_t resultBuffCapacity, ZSTD_inBuffer inBuffer = { srcBuff, srcBuffSize, 0 }; ZSTD_outBuffer outBuffer = {compressedBuff, compressedBuffCapacity, 0 }; - ZSTD_CCtxParam_setParameter(cctxParams, ZSTD_p_compressionLevel, 1); - ZSTD_CCtxParam_setParameter(cctxParams, ZSTD_p_test, 1); - - ZSTD_CCtx_applyCCtxParams(cctx, cctxParams); + CHECK_Z( ZSTD_CCtxParam_setParameter(cctxParams, ZSTD_p_compressionLevel, 1) ); + CHECK_Z( ZSTD_CCtx_applyCCtxParams(cctx, cctxParams) ); CHECK_Z (ZSTD_compress_generic(cctx, &outBuffer, &inBuffer, ZSTD_e_end) ); @@ -88,15 +94,6 @@ static size_t checkBuffers(const void* buff1, const void* buff2, size_t buffSize return pos; } -static void crash(int errorCode){ - /* abort if AFL/libfuzzer, exit otherwise */ - #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION /* could also use __AFL_COMPILER */ - abort(); - #else - exit(errorCode); - #endif -} - static void roundTripCheck(const void* srcBuff, size_t srcBuffSize) { size_t const cBuffSize = ZSTD_compressBound(srcBuffSize); diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c index ce50925a..ced9c57f 100644 --- a/tests/zstreamtest.c +++ b/tests/zstreamtest.c @@ -1655,12 +1655,8 @@ static int fuzzerTests_newAPI_opaque(U32 seed, U32 nbTests, unsigned startTest, } if (FUZ_rand(&lseed) & 1) CHECK_Z (ZSTD_CCtxParam_setParameter(cctxParams, ZSTD_p_forceMaxWindow, FUZ_rand(&lseed) & 1) ); -#if 0 - if (FUZ_rand(&lseed) & 1) CHECK_Z (ZSTD_CCtxParam_setParameter(cctxParams, ZSTD_p_test, FUZ_rand(&lseed) & 1) ); -#endif /* Apply parameters */ - CHECK_Z (ZSTD_CCtx_applyCCtxParams(zc, cctxParams) ); if (FUZ_rand(&lseed) & 1) { @@ -1795,9 +1791,6 @@ _output_error: goto _cleanup; } - - - /*-******************************************************* * Command line *********************************************************/