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

Implement From<Vec<u32>> for dc_array_t and use it instead of new()

Browse Source
This commit is contained in:
Alexander Krotov
2019-08-11 20:47:17 +03:00
parent 16f891c290
commit 6c95d008e0
4 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/contact.rs
View File

@@ -478,7 +478,7 @@ impl<'a> Contact<'a> {
.unwrap_or_default();
let mut add_self = false;
let mut ret = dc_array_t::new(100);
let mut ret = Vec::new();
if (listflags & DC_GCL_VERIFIED_ONLY) > 0 || query.is_some() {
let s3str_like_cmd = format!(
@@ -509,7 +509,7 @@ impl<'a> Contact<'a> {
|row| row.get::<_, i32>(0),
|ids| {
for id in ids {
ret.add_id(id? as u32);
ret.push(id? as u32);
}
Ok(())
},
@@ -537,7 +537,7 @@ impl<'a> Contact<'a> {
|row| row.get::<_, i32>(0),
|ids| {
for id in ids {
ret.add_id(id? as u32);
ret.push(id? as u32);
}
Ok(())
}
@@ -545,10 +545,10 @@ impl<'a> Contact<'a> {
}
if 0 != listflags & DC_GCL_ADD_SELF as u32 && add_self {
ret.add_id(DC_CONTACT_ID_SELF as u32);
ret.push(DC_CONTACT_ID_SELF as u32);
}
Ok(ret.into_raw())
Ok(dc_array_t::from(ret).into_raw())
}
pub fn get_blocked_cnt(context: &Context) -> usize {
@@ -572,13 +572,13 @@ impl<'a> Contact<'a> {
params![DC_CONTACT_ID_LAST_SPECIAL as i32],
|row| row.get::<_, i32>(0),
|ids| {
let mut ret = dc_array_t::new(100);
let mut ret = Vec::new();
for id in ids {
ret.add_id(id? as u32);
ret.push(id? as u32);
}
Ok(ret.into_raw())
Ok(dc_array_t::from(ret).into_raw())
},
)
.unwrap_or_else(|_| std::ptr::null_mut())