Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-18 22:16:30 +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

15
src/context.rs
View File

@@ -496,13 +496,12 @@ pub fn dc_get_fresh_msgs(context: &Context) -> *mut dc_array_t {
&[10, 9, if 0 != show_deaddrop { 2 } else { 0 }],
|row| row.get(0),
|rows| {
let mut ret = dc_array_t::new(128);
let mut ret = Vec::new();
for row in rows {
let id = row?;
ret.add_id(id);
let id: u32 = row?;
ret.push(id);
}
Ok(ret.into_raw())
Ok(dc_array_t::from(ret).into_raw())
},
)
.unwrap()
@@ -536,7 +535,7 @@ pub fn dc_search_msgs(
AND ct.blocked=0 AND (m.txt LIKE ? OR ct.name LIKE ?) ORDER BY m.timestamp DESC,m.id DESC;"
};
let mut ret = dc_array_t::new(100);
let mut ret = Vec::new();
let success = context
.sql
@@ -546,7 +545,7 @@ pub fn dc_search_msgs(
|row| row.get::<_, i32>(0),
|rows| {
for id in rows {
ret.add_id(id? as u32);
ret.push(id? as u32);
}
Ok(())
},
@@ -554,7 +553,7 @@ pub fn dc_search_msgs(
.is_ok();
if success {
return ret.into_raw();
return dc_array_t::from(ret).into_raw();
}
std::ptr::null_mut()