renamed to ZWRAP_deflateReset_keepDict

diff --git a/zlibWrapper/examples/zwrapbench.c b/zlibWrapper/examples/zwrapbench.c
index 02e6b77d3a0d14bf9103ac2c38d6adfa0e805d79..d16fcfdd5f1b7389f2bfbfd7f2e224f09c2a0eca 100644 (file)
--- a/zlibWrapper/examples/zwrapbench.c
+++ b/zlibWrapper/examples/zwrapbench.c
@@ -298,14 +298,14 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                         U32 blockNb;
                         for (blockNb=0; blockNb<nbBlocks; blockNb++) {
                             if (ZWRAP_isUsingZSTDcompression())
-                                ret = ZWRAP_deflateResetWithoutDict(&def); /* reuse dictionary to make compression faster */
+                                ret = ZWRAP_deflateReset_keepDict(&def); /* reuse dictionary to make compression faster */
                             else
                                 ret = deflateReset(&def);
                             if (ret != Z_OK) EXM_THROW(1, "deflateReset failure");
                             if (useSetDict) {
                                 ret = deflateSetDictionary(&def, dictBuffer, dictBufferSize);
                                 if (ret != Z_OK) EXM_THROW(1, "deflateSetDictionary failure");
-                                if (ZWRAP_isUsingZSTDcompression()) useSetDict = 0; /* zstd doesn't require deflateSetDictionary after ZWRAP_deflateResetWithoutDict */
+                                if (ZWRAP_isUsingZSTDcompression()) useSetDict = 0; /* zstd doesn't require deflateSetDictionary after ZWRAP_deflateReset_keepDict */
                             }
                             def.next_in = (const void*) blockTable[blockNb].srcPtr;
                             def.avail_in = blockTable[blockNb].srcSize;
@@ -439,7 +439,7 @@ static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                         U32 blockNb;
                         for (blockNb=0; blockNb<nbBlocks; blockNb++) {
                             if (ZWRAP_isUsingZSTDdecompression(&inf))
-                                ret = ZWRAP_inflateResetWithoutDict(&inf); /* reuse dictionary to make decompression faster; inflate will return Z_NEED_DICT only for the first time */
+                                ret = ZWRAP_inflateReset_keepDict(&inf); /* reuse dictionary to make decompression faster; inflate will return Z_NEED_DICT only for the first time */
                             else
                                 ret = inflateReset(&inf);
                             if (ret != Z_OK) EXM_THROW(1, "inflateReset failure");

diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index 803d491110d2c1b803e2a1359a4ec97fd3841274..97f9269a4d003bcee9c49ddf5d52311a6cd64f1d 100644 (file)
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -203,9 +203,9 @@ ZEXTERN int ZEXPORT z_deflateInit2_ OF((z_streamp strm, int level, int method,
 }
 
 
-int ZWRAP_deflateResetWithoutDict(z_streamp strm)
+int ZWRAP_deflateReset_keepDict(z_streamp strm)
 {
-    LOG_WRAPPERC("- ZWRAP_deflateResetWithoutDict\n");
+    LOG_WRAPPERC("- ZWRAP_deflateReset_keepDict\n");
     if (!g_ZWRAP_useZSTDcompression)
         return deflateReset(strm);
 
@@ -222,7 +222,7 @@ ZEXTERN int ZEXPORT z_deflateReset OF((z_streamp strm))
     if (!g_ZWRAP_useZSTDcompression)
         return deflateReset(strm);
     
-    ZWRAP_deflateResetWithoutDict(strm);
+    ZWRAP_deflateReset_keepDict(strm);
 
     { ZWRAP_CCtx* zwc = (ZWRAP_CCtx*) strm->state;
       if (zwc) zwc->comprState = 0;
@@ -522,9 +522,9 @@ ZEXTERN int ZEXPORT z_inflateInit2_ OF((z_streamp strm, int  windowBits,
     }
 }
 
-int ZWRAP_inflateResetWithoutDict(z_streamp strm)
+int ZWRAP_inflateReset_keepDict(z_streamp strm)
 {
-    LOG_WRAPPERD("- ZWRAP_inflateResetWithoutDict\n");
+    LOG_WRAPPERD("- ZWRAP_inflateReset_keepDict\n");
     if (g_ZWRAPdecompressionType == ZWRAP_FORCE_ZLIB || !strm->reserved)
         return inflateReset(strm);
 
@@ -550,7 +550,7 @@ ZEXTERN int ZEXPORT z_inflateReset OF((z_streamp strm))
     if (g_ZWRAPdecompressionType == ZWRAP_FORCE_ZLIB || !strm->reserved)
         return inflateReset(strm);
 
-    { int ret = ZWRAP_inflateResetWithoutDict(strm);
+    { int ret = ZWRAP_inflateReset_keepDict(strm);
       if (ret != Z_OK) return ret; }
 
     { ZWRAP_DCtx* zwd = (ZWRAP_DCtx*) strm->state;

diff --git a/zlibWrapper/zstd_zlibwrapper.h b/zlibWrapper/zstd_zlibwrapper.h
index f2e4ce2651206b074d6ce28bacf4b01468d2c846..9abbb7aa2af4b8702ea3dae0d72b5121883884ac 100644 (file)
--- a/zlibWrapper/zstd_zlibwrapper.h
+++ b/zlibWrapper/zstd_zlibwrapper.h
@@ -48,7 +48,7 @@ int ZWRAP_setPledgedSrcSize(z_streamp strm, unsigned long long pledgedSrcSize);
 /* Similar to deflateReset but preserves dictionary set using deflateSetDictionary.
    It should improve compression speed because there will be less calls to deflateSetDictionary 
    When using zlib compression this method redirects to deflateReset. */
-int ZWRAP_deflateResetWithoutDict(z_streamp strm);
+int ZWRAP_deflateReset_keepDict(z_streamp strm);
 
 
 
@@ -67,7 +67,7 @@ int ZWRAP_isUsingZSTDdecompression(z_streamp strm);
 /* Similar to inflateReset but preserves dictionary set using inflateSetDictionary.
    inflate() will return Z_NEED_DICT only for the first time what will improve decompression speed.
    For zlib streams this method redirects to inflateReset. */
-int ZWRAP_inflateResetWithoutDict(z_streamp strm);
+int ZWRAP_inflateReset_keepDict(z_streamp strm);
 
 
 #if defined (__cplusplus)