From: Yann Collet <cyan@fb.com>
Date: Wed, 1 Dec 2021 23:29:49 +0000 (-0800)
Subject: Merge branch 'dev' into tomerge2051
X-Git-Tag: v1.5.1~1^2~39^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f64b31585989bc6a4a1bb1628a01887fdcecf3f;p=thirdparty%2Fzstd.git

Merge branch 'dev' into tomerge2051
---

3f64b31585989bc6a4a1bb1628a01887fdcecf3f
diff --cc lib/zstd.h
index c3f642d47,571d5fe90..66ec125d0
--- a/lib/zstd.h
+++ b/lib/zstd.h
@@@ -1451,9 -1439,29 +1452,29 @@@ ZSTDLIB_STATIC_API size_t ZSTD_compress
   *
   * @return : number of bytes written or a ZSTD error.
   */
 -ZSTDLIB_API size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity,
 +ZSTDLIB_STATIC_API size_t ZSTD_writeSkippableFrame(void* dst, size_t dstCapacity,
                                              const void* src, size_t srcSize, unsigned magicVariant);
  
+ /*! ZSTD_readSkippableFrame() :
+  * Retrieves a zstd skippable frame containing data given by src, and writes it to dst buffer.
+  *
+  * The parameter magicVariant will receive the magicVariant that was supplied when the frame was written,
+  * i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START.  This can be NULL if the caller is not interested
+  * in the magicVariant.
+  *
+  * Returns an error if destination buffer is not large enough, or if the frame is not skippable.
+  *
+  * @return : number of bytes written or a ZSTD error.
+  */
+ ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsigned* magicVariant,
+                                             const void* src, size_t srcSize);
+ 
+ /*! ZSTD_isSkippableFrame() :
+  *  Tells if the content of `buffer` starts with a valid Frame Identifier for a skippable frame.
+  */
+ ZSTDLIB_API unsigned ZSTD_isSkippableFrame(const void* buffer, size_t size);
+ 
+ 
  
  /***************************************
  *  Memory management
@@@ -1581,20 -1589,20 +1602,20 @@@ ZSTDLIB_STATIC_API ZSTD_CDict* ZSTD_cre
                                                    ZSTD_compressionParameters cParams,
                                                    ZSTD_customMem customMem);
  
- /* ! Thread pool :
-  * These prototypes make it possible to share a thread pool among multiple compression contexts.
-  * This can limit resources for applications with multiple threads where each one uses
-  * a threaded compression mode (via ZSTD_c_nbWorkers parameter).
-  * ZSTD_createThreadPool creates a new thread pool with a given number of threads.
-  * Note that the lifetime of such pool must exist while being used.
-  * ZSTD_CCtx_refThreadPool assigns a thread pool to a context (use NULL argument value
-  * to use an internal thread pool).
-  * ZSTD_freeThreadPool frees a thread pool, accepts NULL pointer.
+ /*! Thread pool :
+  *  These prototypes make it possible to share a thread pool among multiple compression contexts.
+  *  This can limit resources for applications with multiple threads where each one uses
+  *  a threaded compression mode (via ZSTD_c_nbWorkers parameter).
+  *  ZSTD_createThreadPool creates a new thread pool with a given number of threads.
+  *  Note that the lifetime of such pool must exist while being used.
+  *  ZSTD_CCtx_refThreadPool assigns a thread pool to a context (use NULL argument value
+  *  to use an internal thread pool).
+  *  ZSTD_freeThreadPool frees a thread pool, accepts NULL pointer.
   */
  typedef struct POOL_ctx_s ZSTD_threadPool;
 -ZSTDLIB_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads);
 -ZSTDLIB_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool);  /* accept NULL pointer */
 -ZSTDLIB_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool);
 +ZSTDLIB_STATIC_API ZSTD_threadPool* ZSTD_createThreadPool(size_t numThreads);
 +ZSTDLIB_STATIC_API void ZSTD_freeThreadPool (ZSTD_threadPool* pool);  /* accept NULL pointer */
 +ZSTDLIB_STATIC_API size_t ZSTD_CCtx_refThreadPool(ZSTD_CCtx* cctx, ZSTD_threadPool* pool);
  
  
  /*