updated ZSTD_initStaticDDict() prototype

can also specify dictContentType.
This commit is contained in:
Yann Collet
2018-03-20 14:52:02 -07:00
parent 353117c5d7
commit 31b54b6eea
4 changed files with 8 additions and 6 deletions
+3 -2
View File
@@ -2432,7 +2432,8 @@ ZSTD_DDict* ZSTD_createDDict_byReference(const void* dictBuffer, size_t dictSize
const ZSTD_DDict* ZSTD_initStaticDDict(
void* workspace, size_t workspaceSize,
const void* dict, size_t dictSize,
ZSTD_dictLoadMethod_e dictLoadMethod)
ZSTD_dictLoadMethod_e dictLoadMethod,
ZSTD_dictMode_e dictContentType)
{
size_t const neededSpace =
sizeof(ZSTD_DDict) + (dictLoadMethod == ZSTD_dlm_byRef ? 0 : dictSize);
@@ -2445,7 +2446,7 @@ const ZSTD_DDict* ZSTD_initStaticDDict(
memcpy(ddict+1, dict, dictSize); /* local copy */
dict = ddict+1;
}
if (ZSTD_isError( ZSTD_initDDict_internal(ddict, dict, dictSize, ZSTD_dlm_byRef, ZSTD_dm_auto) ))
if (ZSTD_isError( ZSTD_initDDict_internal(ddict, dict, dictSize, ZSTD_dlm_byRef, dictContentType) ))
return NULL;
return ddict;
}
+2 -1
View File
@@ -580,7 +580,8 @@ ZSTDLIB_API const ZSTD_CDict* ZSTD_initStaticCDict(
ZSTDLIB_API const ZSTD_DDict* ZSTD_initStaticDDict(
void* workspace, size_t workspaceSize,
const void* dict, size_t dictSize,
ZSTD_dictLoadMethod_e dictLoadMethod);
ZSTD_dictLoadMethod_e dictLoadMethod,
ZSTD_dictMode_e dictMode);
/*! Custom memory allocation :
* These prototypes make it possible to pass your own allocation/free functions.