From 788a8b7091bbdde77817030e0836d7a7a786fd99 Mon Sep 17 00:00:00 2001 From: Mason Reed 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/template_simplifier.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'rust/src/template_simplifier.rs') diff --git a/rust/src/template_simplifier.rs b/rust/src/template_simplifier.rs index 57d2b0b4..c9e54e72 100644 --- a/rust/src/template_simplifier.rs +++ b/rust/src/template_simplifier.rs @@ -6,15 +6,10 @@ use binaryninjacore_sys::{BNRustSimplifyStrToFQN, BNRustSimplifyStrToStr}; pub fn simplify_str_to_str(input: S) -> BnString { let name = input.to_cstr(); - unsafe { BnString::from_raw(BNRustSimplifyStrToStr(name.as_ref().as_ptr() as *mut _)) } + unsafe { BnString::from_raw(BNRustSimplifyStrToStr(name.as_ptr())) } } pub fn simplify_str_to_fqn(input: S, simplify: bool) -> QualifiedName { let name = input.to_cstr(); - unsafe { - QualifiedName::from_owned_raw(BNRustSimplifyStrToFQN( - name.as_ref().as_ptr() as *mut _, - simplify, - )) - } + unsafe { QualifiedName::from_owned_raw(BNRustSimplifyStrToFQN(name.as_ptr(), simplify)) } } -- cgit v1.3.1