some more constants that the zstd-rs experimental feature uses

Author: folkertdev

c2rust-lib.rs

@@ -69,10 +69,11 @@ pub mod lib {
 
 pub use crate::lib::zstd::{
     ZSTD_ParamSwitch_e, ZSTD_ResetDirective, ZSTD_cParameter, ZSTD_dParameter,
-    ZSTD_dictAttachPref_e, ZSTD_format_e, ZSTD_inBuffer, ZSTD_outBuffer, ZSTD_strategy,
-    ZSTD_BLOCKSIZELOG_MAX, ZSTD_BLOCKSIZE_MAX, ZSTD_CLEVEL_DEFAULT, ZSTD_MAGICNUMBER,
-    ZSTD_MAGIC_DICTIONARY, ZSTD_MAGIC_SKIPPABLE_MASK, ZSTD_MAGIC_SKIPPABLE_START,
-    ZSTD_VERSION_MAJOR, ZSTD_VERSION_MINOR, ZSTD_VERSION_NUMBER, ZSTD_VERSION_RELEASE,
+    ZSTD_dictAttachPref_e, ZSTD_format_e, ZSTD_frameProgression, ZSTD_inBuffer, ZSTD_outBuffer,
+    ZSTD_strategy, ZSTD_BLOCKSIZELOG_MAX, ZSTD_BLOCKSIZE_MAX, ZSTD_CLEVEL_DEFAULT,
+    ZSTD_FRAMEHEADERSIZE_MAX, ZSTD_MAGICNUMBER, ZSTD_MAGIC_DICTIONARY, ZSTD_MAGIC_SKIPPABLE_MASK,
+    ZSTD_MAGIC_SKIPPABLE_START, ZSTD_VERSION_MAJOR, ZSTD_VERSION_MINOR, ZSTD_VERSION_NUMBER,
+    ZSTD_VERSION_RELEASE, ZSTD_WINDOWLOG_MAX_32, ZSTD_WINDOWLOG_MAX_64,
 };
 
 pub use crate::lib::decompress::{
@@ -119,7 +120,14 @@ pub use crate::lib::compress::zstd_compress::{
     ZSTD_flushStream, ZSTD_freeCCtx, ZSTD_freeCDict, ZSTD_getBlockSize, ZSTD_getDictID_fromCDict,
     ZSTD_getFrameProgression, ZSTD_initCStream, ZSTD_initCStream_srcSize,
     ZSTD_initCStream_usingCDict, ZSTD_initCStream_usingDict, ZSTD_maxCLevel, ZSTD_minCLevel,
-    ZSTD_sequenceBound, ZSTD_sizeof_CCtx, ZSTD_sizeof_CDict,
+    ZSTD_sequenceBound, ZSTD_sizeof_CCtx, ZSTD_sizeof_CDict, ZSTD_BLOCKSIZE_MAX_MIN,
+    ZSTD_BLOCKSPLITTER_LEVEL_MAX, ZSTD_CHAINLOG_MAX_32, ZSTD_CHAINLOG_MAX_64, ZSTD_CHAINLOG_MIN,
+    ZSTD_HASHLOG_MIN, ZSTD_LDM_BUCKETSIZELOG_MAX, ZSTD_LDM_BUCKETSIZELOG_MIN, ZSTD_LDM_HASHLOG_MIN,
+    ZSTD_LDM_HASHRATELOG_MIN, ZSTD_LDM_MINMATCH_MAX, ZSTD_LDM_MINMATCH_MIN, ZSTD_MINMATCH_MAX,
+    ZSTD_MINMATCH_MIN, ZSTD_OVERLAPLOG_MAX, ZSTD_OVERLAPLOG_MIN, ZSTD_SEARCHLOG_MIN,
+    ZSTD_SKIPPABLEHEADERSIZE, ZSTD_SRCSIZEHINT_MIN, ZSTD_TARGETCBLOCKSIZE_MAX,
+    ZSTD_TARGETCBLOCKSIZE_MIN, ZSTD_TARGETLENGTH_MAX, ZSTD_TARGETLENGTH_MIN,
+    ZSTD_WINDOWLOG_LIMIT_DEFAULT, ZSTD_WINDOWLOG_MIN,
 };
 
 pub mod internal {

lib/zstd.rs

@@ -1,6 +1,8 @@
 use core::ffi::c_uint;
 use libc::size_t;
 
+pub const ZSTD_FRAMEHEADERSIZE_MAX: core::ffi::c_int = 18;
+
 pub const ZSTD_WINDOWLOG_MAX_32: core::ffi::c_int = 30;
 pub const ZSTD_WINDOWLOG_MAX_64: core::ffi::c_int = 31;
 pub const ZSTD_WINDOWLOG_MAX: core::ffi::c_int = match size_of::<usize>() {

test-libzstd-rs-sys/src/decompress.rs

@@ -996,8 +996,6 @@ fn test_decompress_stream_with_dict() {
     const DICT: &[u8] = include_bytes!("../test-data/decompress-stream-dict.dat");
     const INPUT: &[u8] = include_bytes!("../test-data/decompress-stream-input.dat");
 
-    const ZSTD_WINDOWLOG_LIMIT_DEFAULT: core::ffi::c_int = 27;
-
     unsafe {
         use libzstd_rs_sys::*;
 
@@ -1051,8 +1049,6 @@ fn decompression_by_small_increment() {
         0xFFFF
     }
 
-    const ZSTD_WINDOWLOG_LIMIT_DEFAULT: core::ffi::c_int = 27;
-
     unsafe {
         use libzstd_rs_sys::*;