]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
[contrib][linux] Make zstd_reset_cstream() functionally identical to ZSTD_resetCStream() 3088/head
authorCyber Knight <cyberknight755@gmail.com>
Thu, 10 Mar 2022 07:32:13 +0000 (15:32 +0800)
committerCyber Knight <cyberknight755@gmail.com>
Thu, 10 Mar 2022 07:32:13 +0000 (15:32 +0800)
- As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel, making zstd_reset_cstream() functionally identical to ZSTD_resetCStream() would be the perfect way to fix the warning without touching any core functions or breaking other parts of the code.

Suggested-by: Nick Terrell <terrelln@fb.com>
Signed-off-by: Cyber Knight <cyberknight755@gmail.com>
contrib/linux-kernel/zstd_compress_module.c

index 8b4c764d426a9fb4020842b9f971e9a794c0fc37..04e1b5c01d9b645741699951d5c19b892ca6c277 100644 (file)
@@ -131,9 +131,13 @@ zstd_cstream *zstd_init_cstream(const zstd_parameters *parameters,
 EXPORT_SYMBOL(zstd_init_cstream);
 
 size_t zstd_reset_cstream(zstd_cstream *cstream,
-       unsigned long long pledgedSrcSize)
+       unsigned long long pledged_src_size)
 {
-       return ZSTD_CCtx_setPledgedSrcSize(cstream, pledgedSrcSize);
+       if (pledged_src_size == 0)
+               pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
+       ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_reset(cstream, ZSTD_reset_session_only) );
+       ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_setPledgedSrcSize(cstream, pledged_src_size) );
+       return 0;
 }
 EXPORT_SYMBOL(zstd_reset_cstream);