From a826c589dfc10c542deba7ca3343a462e02d6bde Mon Sep 17 00:00:00 2001 From: Mason Reed Date: Sun, 4 May 2025 19:10:56 -0400 Subject: [Rust] Simplify `BnStrCompatible` trait Followup to https://github.com/Vector35/binaryninja-api/pull/5897/ This simplifies usage of the trait in user code, should just be able to `to_cstr` to get the cstr repr and then call `as_ptr`. Co-authored-by: Michael Krasnitski --- rust/src/external_library.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rust/src/external_library.rs') diff --git a/rust/src/external_library.rs b/rust/src/external_library.rs index 5360f29d..26425ccd 100644 --- a/rust/src/external_library.rs +++ b/rust/src/external_library.rs @@ -1,6 +1,6 @@ use crate::project::file::ProjectFile; use crate::rc::{CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable}; -use crate::string::{BnStrCompatible, BnString}; +use crate::string::{AsCStr, BnString}; use crate::symbol::Symbol; use binaryninjacore_sys::*; use std::ffi::c_char; @@ -167,9 +167,9 @@ impl ExternalLocation { /// Set the symbol pointed to by this ExternalLocation. /// ExternalLocations must have a valid target address and/or symbol set. - pub fn set_target_symbol(&self, symbol: Option) -> bool { + pub fn set_target_symbol(&self, symbol: Option) -> bool { let symbol = symbol - .map(|x| x.into_bytes_with_nul().as_ref().as_ptr() as *const c_char) + .map(|x| x.to_cstr().as_ref().as_ptr() as *const c_char) .unwrap_or(std::ptr::null_mut()); unsafe { BNExternalLocationSetTargetSymbol(self.handle.as_ptr(), symbol) } } -- cgit v1.3.1