Use single implementation for resource type open

rusterlium · Aug 5, 2024 · 733e8c3 · 733e8c3
1 parent b6f5369
commit 733e8c3
Showing 1 changed file with 12 additions and 23 deletions.
diff --git a/rustler/src/resource/registration.rs b/rustler/src/resource/registration.rs
@@ -198,7 +198,6 @@ unsafe extern "C" fn resource_dyncall<T: Resource>(
     res.dyncall(env, call_data);
 }
 
-#[cfg(not(feature = "nif_version_2_16"))]
 pub unsafe fn open_resource_type(
     env: *mut ErlNifEnv,
     name: &[u8],
@@ -212,7 +211,7 @@ pub unsafe fn open_resource_type(
 
     let res = {
         let mut tried = MaybeUninit::uninit();
-        rustler_sys::enif_open_resource_type_x(env, name_p, &init, flags, tried.as_mut_ptr())
+        OPEN_RESOURCE_TYPE(env, name_p, &init, flags, tried.as_mut_ptr())
     };
 
     if res.is_null() {
@@ -222,29 +221,19 @@ pub unsafe fn open_resource_type(
     }
 }
 
-#[cfg(feature = "nif_version_2_16")]
-pub unsafe fn open_resource_type(
-    env: *mut ErlNifEnv,
-    name: &[u8],
-    init: ErlNifResourceTypeInit,
-    flags: ErlNifResourceFlags,
-) -> Option<*const ErlNifResourceType> {
-    // Panic if name is not null-terminated.
-    assert_eq!(name.last().cloned(), Some(0u8));
-
-    let name_p = name.as_ptr() as *const c_char;
+type OpenResourceTypeFn = unsafe fn(
+    *mut ErlNifEnv,
+    *const c_char,
+    *const ErlNifResourceTypeInit,
+    ErlNifResourceFlags,
+    *mut ErlNifResourceFlags,
+) -> *const ErlNifResourceType;
 
-    let res = {
-        let mut tried = MaybeUninit::uninit();
-        rustler_sys::enif_init_resource_type(env, name_p, &init, flags, tried.as_mut_ptr())
-    };
+#[cfg(feature = "nif_version_2_16")]
+static OPEN_RESOURCE_TYPE: OpenResourceTypeFn = rustler_sys::enif_init_resource_type;
 
-    if res.is_null() {
-        None
-    } else {
-        Some(res)
-    }
-}
+#[cfg(not(feature = "nif_version_2_16"))]
+static OPEN_RESOURCE_TYPE: OpenResourceTypeFn = rustler_sys::enif_open_resource_type_x;
 
 const fn max(i: i32, j: i32) -> i32 {
     if i > j {