eliott/libsignal
1
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2026-04-25 17:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffi: Micro-optimization for returning a String

Browse Source
This commit is contained in:
Jordan Rose
2026-03-27 18:03:47 -07:00
parent 8df85d3c0b
commit 49d53a6506
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust/bridge/shared/types/src/ffi/convert.rs
View File

@@ -718,7 +718,11 @@ where
impl ResultTypeInfo for String {
type ResultType = *const std::ffi::c_char;
fn convert_into(self) -> SignalFfiResult<Self::ResultType> {
self.deref().convert_into()
let mut buf = Vec::from(self);
buf.push(0);
Ok(CString::from_vec_with_nul(buf)
.expect("No NULL characters in string being returned to C")
.into_raw())
}
}
@@ -726,7 +730,10 @@ impl ResultTypeInfo for String {
impl ResultTypeInfo for Option<String> {
type ResultType = *const std::ffi::c_char;
fn convert_into(self) -> SignalFfiResult<Self::ResultType> {
self.as_deref().convert_into()
match self {
Some(s) => s.convert_into(),
None => Ok(std::ptr::null()),
}
}
}