simplify constructors

Author: folkertdev

zlib-rs/src/deflate.rs

@@ -122,21 +122,9 @@ impl<'a> DeflateStream<'a> {
         )
     }
 
-    pub fn new(level: i32, zlib_header: bool, window_bits: u8) -> Self {
+    pub fn new(config: DeflateConfig) -> Self {
         let mut inner = crate::c_api::z_stream::default();
 
-        let config = DeflateConfig {
-            window_bits: if zlib_header {
-                i32::from(window_bits)
-            } else {
-                -i32::from(window_bits)
-            },
-            level,
-            method: Method::Deflated,
-            mem_level: DEF_MEM_LEVEL,
-            strategy: Strategy::Default,
-        };
-
         let ret = crate::deflate::init(&mut inner, config);
         assert_eq!(ret, ReturnCode::Ok);
 
@@ -151,7 +139,7 @@ const HASH_BITS: usize = 16;
 
 /// Maximum value for memLevel in deflateInit2
 const MAX_MEM_LEVEL: i32 = 9;
-const DEF_MEM_LEVEL: i32 = if MAX_MEM_LEVEL > 8 { 8 } else { MAX_MEM_LEVEL };
+pub const DEF_MEM_LEVEL: i32 = if MAX_MEM_LEVEL > 8 { 8 } else { MAX_MEM_LEVEL };
 
 #[repr(i32)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]

zlib-rs/src/inflate.rs

@@ -127,17 +127,9 @@ impl<'a> InflateStream<'a> {
         unsafe { &mut *(self as *mut _ as *mut z_stream) }
     }
 
-    pub fn new(zlib_header: bool, window_bits: u8) -> Self {
+    pub fn new(config: InflateConfig) -> Self {
         let mut inner = crate::c_api::z_stream::default();
 
-        let config = InflateConfig {
-            window_bits: if zlib_header {
-                i32::from(window_bits)
-            } else {
-                -i32::from(window_bits)
-            },
-        };
-
         let ret = crate::inflate::init(&mut inner, config);
         assert_eq!(ret, ReturnCode::Ok);
 

zlib-rs/src/stable.rs

@@ -1,3 +1,4 @@
+use crate::deflate::DeflateConfig;
 use crate::inflate::InflateConfig;
 use crate::ReturnCode;
 pub use crate::{DeflateFlush, InflateFlush};
@@ -85,8 +86,18 @@ impl Inflate {
     }
 
     /// Create a new instance. Note that it allocates in various ways and thus should be re-used.
+    ///
+    /// The `window_bits` must be in the range `8..=15`, with `15` being most common.
     pub fn new(zlib_header: bool, window_bits: u8) -> Self {
-        Self(crate::inflate::InflateStream::new(zlib_header, window_bits))
+        let config = InflateConfig {
+            window_bits: if zlib_header {
+                i32::from(window_bits)
+            } else {
+                -i32::from(window_bits)
+            },
+        };
+
+        Self(crate::inflate::InflateStream::new(config))
     }
 
     /// Reset the state to allow handling a new stream.
@@ -203,12 +214,20 @@ impl Deflate {
     }
 
     /// Create a new instance - this allocates so should be done with care.
+    ///
+    /// The `window_bits` must be in the range `8..=15`, with `15` being most common.
     pub fn new(level: i32, zlib_header: bool, window_bits: u8) -> Self {
-        Self(crate::deflate::DeflateStream::new(
+        let config = DeflateConfig {
+            window_bits: if zlib_header {
+                i32::from(window_bits)
+            } else {
+                -i32::from(window_bits)
+            },
             level,
-            zlib_header,
-            window_bits,
-        ))
+            ..DeflateConfig::default()
+        };
+
+        Self(crate::deflate::DeflateStream::new(config))
     }
 
     /// Prepare the instance for a new stream.