ZSTD_format_e: make struct

Author: folkertdev

lib/compress/zstd_compress.rs

@@ -2414,7 +2414,7 @@ pub unsafe extern "C" fn ZSTD_CCtxParams_setParameter(
 ) -> size_t {
     match param.0 {
         10 => {
-            let Ok(format) = Format::try_from(value as ZSTD_format_e) else {
+            let Ok(format) = Format::try_from(value) else {
                 return Error::parameter_outOfBound.to_error_code();
             };
 

lib/decompress/zstd_decompress.rs

@@ -906,7 +906,7 @@ pub unsafe extern "C" fn ZSTD_getFrameHeader(
     src: *const core::ffi::c_void,
     srcSize: size_t,
 ) -> size_t {
-    ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, Format::ZSTD_f_zstd1 as _)
+    ZSTD_getFrameHeader_advanced(zfhPtr, src, srcSize, ZSTD_format_e::ZSTD_f_zstd1)
 }
 
 fn get_frame_header(zfhPtr: &mut ZSTD_FrameHeader, src: &[u8]) -> size_t {
@@ -2549,7 +2549,7 @@ pub unsafe extern "C" fn ZSTD_DCtx_setFormat(
     ZSTD_DCtx_setParameter(
         dctx,
         ZSTD_dParameter::ZSTD_d_format as ZSTD_dParameter,
-        format as core::ffi::c_int,
+        u32::from(format) as core::ffi::c_int,
     )
 }
 #[cfg_attr(feature = "export-symbols", export_name = crate::prefix!(ZSTD_dParam_getBounds))]
@@ -2655,7 +2655,7 @@ pub unsafe extern "C" fn ZSTD_DCtx_setParameter(
             return 0;
         }
         ZSTD_dParameter::ZSTD_d_experimentalParam1 => {
-            let Ok(format) = Format::try_from(value as ZSTD_format_e) else {
+            let Ok(format) = Format::try_from(value) else {
                 return Error::parameter_outOfBound.to_error_code();
             };
 

lib/zstd.rs

@@ -115,7 +115,20 @@ pub type ZSTD_freeFunction =
 pub type ZSTD_allocFunction =
     Option<unsafe extern "C" fn(*mut core::ffi::c_void, size_t) -> *mut core::ffi::c_void>;
 
-pub type ZSTD_format_e = core::ffi::c_uint;
+#[derive(PartialEq)]
+#[repr(transparent)]
+pub struct ZSTD_format_e(u32);
+
+impl ZSTD_format_e {
+    pub const ZSTD_f_zstd1: Self = Self(Format::ZSTD_f_zstd1 as u32);
+    pub const ZSTD_f_zstd1_magicless: Self = Self(Format::ZSTD_f_zstd1_magicless as u32);
+}
+
+impl From<ZSTD_format_e> for u32 {
+    fn from(value: ZSTD_format_e) -> Self {
+        value.0
+    }
+}
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 #[repr(u32)]
@@ -137,6 +150,18 @@ impl TryFrom<ZSTD_format_e> for Format {
     type Error = ();
 
     fn try_from(value: ZSTD_format_e) -> Result<Self, Self::Error> {
+        match value {
+            ZSTD_format_e::ZSTD_f_zstd1 => Ok(Self::ZSTD_f_zstd1),
+            ZSTD_format_e::ZSTD_f_zstd1_magicless => Ok(Self::ZSTD_f_zstd1_magicless),
+            _ => Err(()),
+        }
+    }
+}
+
+impl TryFrom<i32> for Format {
+    type Error = ();
+
+    fn try_from(value: i32) -> Result<Self, Self::Error> {
         match value {
             0 => Ok(Self::ZSTD_f_zstd1),
             1 => Ok(Self::ZSTD_f_zstd1_magicless),