Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 01:46:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add get_marker method to dc_array_t

Browse Source
This commit is contained in:
Alexander Krotov
2020-06-29 06:21:52 +03:00
committed by link2xt
parent 615a76f35e
commit 56518420bc
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deltachat-ffi/src/dc_array.rs
View File

@@ -39,6 +39,17 @@ impl dc_array_t {
}
}
pub(crate) fn get_marker(&self, index: usize) -> Option<&str> {
match self {
Self::MsgIds(_) => None,
Self::Chat(array) => None,
Self::Locations(array) => array
.get(index)
.and_then(|location| location.marker.as_deref()),
Self::Uint(_) => None,
}
}
pub(crate) fn get_location(&self, index: usize) -> &Location {
if let Self::Locations(array) = self {
&array[index]

2
deltachat-ffi/src/lib.rs
View File

@@ -2068,7 +2068,7 @@ pub unsafe extern "C" fn dc_array_get_marker(
return std::ptr::null_mut(); // NULL explicitly defined as "no markers"
}
if let Some(s) = &(*array).get_location(index).marker {
if let Some(s) = (*array).get_marker(index) {
s.strdup()
} else {
std::ptr::null_mut()