]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Removed ZBUFF internal util function from public area
authorYann Collet <yann.collet.73@gmail.com>
Sat, 4 Jun 2016 17:16:49 +0000 (19:16 +0200)
committerYann Collet <yann.collet.73@gmail.com>
Sat, 4 Jun 2016 17:16:49 +0000 (19:16 +0200)
lib/common/zbuff.h
lib/compress/zbuff_compress.c
lib/decompress/zbuff_decompress.c

index d761a273f19067c80178207a0e4d1513cfbeb9bf..1f8cb610f58c91507f249c8406182d1d4ed81ce0 100644 (file)
@@ -163,19 +163,10 @@ ZSTDLIB_API size_t ZBUFF_recommendedDOutSize(void);
 #ifdef ZBUFF_STATIC_LINKING_ONLY
 
 /* *************************************
-*  Includes
+*  Dependency
 ***************************************/
 #include "zstd_static.h"     /* ZSTD_parameters */
 
-/* internal util function */
-#define ZBUFF_MIN(a,b) ((a)<(b) ? (a) : (b))
-MEM_STATIC size_t ZBUFF_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
-{
-    size_t length = ZBUFF_MIN(dstCapacity, srcSize);
-    memcpy(dst, src, length);
-    return length;
-}
-
 
 /*-*************************************
 *  Advanced functions
index 65390c29bd16835c05f8c666fa2c10e303f79187..76d3afea111000b059cdca66089dd306be25961d 100644 (file)
@@ -183,6 +183,15 @@ size_t ZBUFF_compressInit(ZBUFF_CCtx* zbc, int compressionLevel)
 }
 
 
+/* internal util function */
+MEM_STATIC size_t ZBUFF_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    size_t const length = MIN(dstCapacity, srcSize);
+    memcpy(dst, src, length);
+    return length;
+}
+
+
 /* *** Compression *** */
 
 static size_t ZBUFF_compressContinue_generic(ZBUFF_CCtx* zbc,
index e3d574355fbda5e170f5a810124a1223508fb6c4..080e3dea360e1f0aa3f3d28cff224d025193d8b1 100644 (file)
@@ -138,6 +138,15 @@ size_t ZBUFF_decompressInit(ZBUFF_DCtx* zbd)
 }
 
 
+/* internal util function */
+MEM_STATIC size_t ZBUFF_limitCopy(void* dst, size_t dstCapacity, const void* src, size_t srcSize)
+{
+    size_t const length = MIN(dstCapacity, srcSize);
+    memcpy(dst, src, length);
+    return length;
+}
+
+
 /* *** Decompression *** */
 
 size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbd,