From 788a8b7091bbdde77817030e0836d7a7a786fd99 Mon Sep 17 00:00:00 2001
From: Mason Reed <mason@vector35.com>
Date: Sun, 4 May 2025 19:47:55 -0400
Subject: [Rust] Simplify usage surrounding c strings

`cstring.as_ref().as_ptr() as *const c_char` -> `cstring.as_ptr()`
`cstring.as_ref().as_ptr() as *mut _` -> `cstring.as_ptr()`
`cstring.as_ptr() as *const c_char` -> `cstring.as_ptr()`

With a few fixes for cstrings that might be dropped prematurely.
---
 rust/src/medium_level_il/function.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'rust/src/medium_level_il')

diff --git a/rust/src/medium_level_il/function.rs b/rust/src/medium_level_il/function.rs
index de3ece02..75ccad82 100644
--- a/rust/src/medium_level_il/function.rs
+++ b/rust/src/medium_level_il/function.rs
@@ -1,5 +1,4 @@
 use binaryninjacore_sys::*;
-use std::ffi::c_char;
 use std::fmt::{Debug, Formatter};
 use std::hash::{Hash, Hasher};
 
@@ -135,7 +134,7 @@ impl MediumLevelILFunction {
                 self.function().handle,
                 offset,
                 &mut owned_raw_var_ty,
-                name.as_ref().as_ptr() as *const c_char,
+                name.as_ptr(),
             )
         }
     }
@@ -282,13 +281,12 @@ impl MediumLevelILFunction {
     ) {
         let mut owned_raw_var_ty = Conf::<&Type>::into_raw(var_type.into());
         let name = name.to_cstr();
-        let name_c_str = name.as_ref();
         unsafe {
             BNCreateAutoStackVariable(
                 self.function().handle,
                 offset,
                 &mut owned_raw_var_ty,
-                name_c_str.as_ptr() as *const c_char,
+                name.as_ptr(),
             )
         }
     }
@@ -307,13 +305,12 @@ impl MediumLevelILFunction {
         let raw_var = BNVariable::from(var);
         let mut owned_raw_var_ty = Conf::<&Type>::into_raw(var_type.into());
         let name = name.to_cstr();
-        let name_c_str = name.as_ref();
         unsafe {
             BNCreateAutoVariable(
                 self.function().handle,
                 &raw_var,
                 &mut owned_raw_var_ty,
-                name_c_str.as_ptr() as *const c_char,
+                name.as_ptr(),
                 ignore_disjoint_uses,
             )
         }
-- 
cgit v1.3.1