[contrib][linux] Fix a warning in zstd_reset_cstream() #3088

cyberknight777 · 2022-03-07T03:57:18Z

This fixes the below warning:

../lib/zstd/zstd_compress_module.c: In function 'zstd_reset_cstream':
../lib/zstd/zstd_compress_module.c:136:9: warning: 'ZSTD_resetCStream' is deprecated [-Wdeprecated-declarations]
136 | return ZSTD_resetCStream(cstream, pledged_src_size);
| ^~~~~~
In file included from ../include/linux/zstd.h:26,
from ../lib/zstd/zstd_compress_module.c:15:
../include/linux/zstd_lib.h:2277:8: note: declared here
2277 | size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize);
| ^~~~~~~~~~~~~~~~~

ZSTD_resetCstream is deprecated and zstd_CCtx_reset is suggested to use hence let's switch to it.

Signed-off-by: Cyber Knight [email protected]

- This fixes the below warning: ../lib/zstd/zstd_compress_module.c: In function 'zstd_reset_cstream': ../lib/zstd/zstd_compress_module.c:136:9: warning: 'ZSTD_resetCStream' is deprecated [-Wdeprecated-declarations] 136 | return ZSTD_resetCStream(cstream, pledged_src_size); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_compress_module.c:15: ../include/linux/zstd_lib.h:2277:8: note: declared here 2277 | size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize); | ^~~~~~~~~~~~~~~~~ ZSTD_resetCstream is deprecated and zstd_CCtx_reset is suggested to use hence let's switch to it. Signed-off-by: Cyber Knight <[email protected]>

facebook-github-bot · 2022-03-07T03:57:22Z

Hi @cyberknight777!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

facebook-github-bot · 2022-03-07T04:46:54Z

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

Cyan4973 · 2022-03-07T17:14:55Z

This is kernel code, so there might be specific reasons.
cc @terrelln .

cyberknight777 · 2022-03-07T17:19:39Z

Hmm I've never gotten this warn when compiling ZSTD 1.5.2 with the Linux kernel. Only warn I've got was the one which I fixed and made the PR with. I'll try another way to fix the warn completely without triggering any other warnings.

contrib/linux-kernel/zstd_compress_module.c

…tx_reset() - The previous patch throws the following warning: ../linux/lib/zstd/zstd_compress_module.c: In function ‘zstd_reset_cstream’: ../linux/lib/zstd/zstd_compress_module.c:136:34: error: enum conversion when passing argument 2 of ‘ZSTD_CCtx_reset’ is invalid in C++ [-Werror=c++-compat] 136 | return ZSTD_CCtx_reset(cstream, pledged_src_size); | ^~~~~~~~~~~~~~~~ In file included from ../linux/include/linux/zstd.h:26, from ../linux/lib/zstd/zstd_compress_module.c:15: ../linux/include/linux/zstd_lib.h:501:20: note: expected ‘ZSTD_ResetDirective’ {aka ‘enum <anonymous>’} but argument is of type ‘long long unsigned int’ 501 | ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset); | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Since we have a choice to either use ZSTD_CCtx_reset or ZSTD_CCtx_setPledgedSrcSize instead of ZSTD_resetCStream, let's switch to ZSTD_CCtx_setPledgedSrcSize to not have any unnecessary warns alongside the kernel build and CI test build. Signed-off-by: Cyber Knight <[email protected]>

…ZSTD_resetCStream() - 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 <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

terrelln

Thanks @cyberknight777!

- As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to commit 15f1b5e {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]>

- As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to 95ce392 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to commit 15f1b5e {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]>

Subsequent to 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to commit 15f1b5e {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]>

Subsequent to 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]>

Subsequent to commit 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]> Signed-off-by: Divyanshu-Modi <[email protected]> Change-Id: I6938dd8030dde2a797528338cff36a7d7eb072a0

Subsequent to commit 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]> Signed-off-by: Divyanshu-Modi <[email protected]> Change-Id: I6938dd8030dde2a797528338cff36a7d7eb072a0 Signed-off-by: Divyanshu-Modi <[email protected]>

Subsequent to commit 15f1b5e {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Signed-off-by: Tashfin Shakeer Rhythm <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: If837c2f681814a26c644332eca3f77b4030824e4 Signed-off-by: TogoFire <[email protected]>

Subsequent to commit 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Change-Id: I05e3139a386011afa44688407777f402ae2c913b Signed-off-by: Tashfin Shakeer Rhythm <[email protected]> Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: I4d9916dd279f3b0508ecb69754540f635ba7c5bc Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: If837c2f681814a26c644332eca3f77b4030824e4 Signed-off-by: TogoFire <[email protected]>

Subsequent to commit 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Change-Id: I05e3139a386011afa44688407777f402ae2c913b Signed-off-by: Tashfin Shakeer Rhythm <[email protected]> Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: I4d9916dd279f3b0508ecb69754540f635ba7c5bc Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: If837c2f681814a26c644332eca3f77b4030824e4 Signed-off-by: TogoFire <[email protected]>

Subsequent to commit 15f1b5e137 {"lib: zstd: Fix a warning in zstd_reset_cstream()"} - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel [1], 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. [1]: facebook/zstd#3088 (comment) Suggested-by: Nick Terrell <[email protected]> Signed-off-by: Cyber Knight <[email protected]> Change-Id: I05e3139a386011afa44688407777f402ae2c913b Signed-off-by: Tashfin Shakeer Rhythm <[email protected]> Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> Change-Id: I4d9916dd279f3b0508ecb69754540f635ba7c5bc Signed-off-by: TogoFire <[email protected]>

- ZSTD_resetDstream() is deprecated hence it is wise to make zstd_reset_dstream() functionally identical to ZSTD_resetDstream() as we have done for the compression stream in [1]. - Also make ZSTD_startingInputLength() visible for the decompression driver to be able to use it. - This fixes the below warning: ../lib/zstd/zstd_decompress_module.c: In function 'zstd_reset_dstream': ../lib/zstd/zstd_decompress_module.c:80:9: warning: 'ZSTD_resetDStream' is deprecated [-Wdeprecated-declarations] 80 | return ZSTD_resetDStream(dstream); | ^~~~~~ In file included from ../include/linux/zstd.h:26, from ../lib/zstd/zstd_decompress_module.c:15: ../include/linux/zstd_lib.h:2569:27: note: declared here 2569 | ZSTDLIB_STATIC_API size_t ZSTD_resetDStream(ZSTD_DStream* zds); | ^~~~~~~~~~~~~~~~~ [1]: facebook/zstd#3088 Signed-off-by: Cyber Knight <[email protected]> (cherry picked from commit 7cba7b960d1295031ec971f82fc7806325aceeac)