From 890d85bdb4293118b6b9ba4efe82e790a1dd904b Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 6 Jan 2021 16:19:42 -0800 Subject: [PATCH] removed CLI dependency to legacy unsafe function makint the CLI ons step closer to being linkable to the dynamic library --- programs/.gitignore | 1 + programs/dibio.c | 18 +++--------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/programs/.gitignore b/programs/.gitignore index 662f70839..2d4edbe45 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -8,6 +8,7 @@ zstd-frugal zstd-small zstd-nolegacy zstd-dictBuilder +zstd-dll # Object files *.o diff --git a/programs/dibio.c b/programs/dibio.c index 6673301ec..c6d267cea 100644 --- a/programs/dibio.c +++ b/programs/dibio.c @@ -255,18 +255,6 @@ static fileStats DiB_fileStats(const char** fileNamesTable, unsigned nbFiles, si } -/*! ZDICT_trainFromBuffer_unsafe_legacy() : - Strictly Internal use only !! - Same as ZDICT_trainFromBuffer_legacy(), but does not control `samplesBuffer`. - `samplesBuffer` must be followed by noisy guard band to avoid out-of-buffer reads. - @return : size of dictionary stored into `dictBuffer` (<= `dictBufferCapacity`) - or an error code. -*/ -size_t ZDICT_trainFromBuffer_unsafe_legacy(void* dictBuffer, size_t dictBufferCapacity, - const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples, - ZDICT_legacy_params_t parameters); - - int DiB_trainFromFiles(const char* dictFileName, unsigned maxDictSize, const char** fileNamesTable, unsigned nbFiles, size_t chunkSize, ZDICT_legacy_params_t* params, ZDICT_cover_params_t* coverParams, @@ -319,9 +307,9 @@ int DiB_trainFromFiles(const char* dictFileName, unsigned maxDictSize, { size_t dictSize; if (params) { DiB_fillNoise((char*)srcBuffer + loadedSize, NOISELENGTH); /* guard band, for end of buffer condition */ - dictSize = ZDICT_trainFromBuffer_unsafe_legacy(dictBuffer, maxDictSize, - srcBuffer, sampleSizes, fs.nbSamples, - *params); + dictSize = ZDICT_trainFromBuffer_legacy(dictBuffer, maxDictSize, + srcBuffer, sampleSizes, fs.nbSamples, + *params); } else if (coverParams) { if (optimize) { dictSize = ZDICT_optimizeTrainFromBuffer_cover(dictBuffer, maxDictSize, -- 2.47.2