Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-20 06:56:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Construct dc_array_t id arrays using safe methods

Browse Source
This commit is contained in:
Alexander Krotov
2019-07-23 00:12:23 +03:00
parent 1f63753a8b
commit 8d43ad4809
3 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/context.rs
View File

@@ -521,13 +521,13 @@ 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 ret = dc_array_new(128 as size_t);
let mut ret = dc_array_t::new(128);
for row in rows {
let id = row?;
unsafe { dc_array_add_id(ret, id) };
ret.add_id(id);
}
Ok(ret)
Ok(ret.as_ptr())
},
)
.unwrap()
@@ -560,7 +560,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 ret = dc_array_new(100 as size_t);
let mut ret = dc_array_t::new(100);
let success = context
.sql
@@ -570,7 +570,7 @@ pub fn dc_search_msgs(
|row| row.get::<_, i32>(0),
|rows| {
for id in rows {
unsafe { dc_array_add_id(ret, id? as u32) };
ret.add_id(id? as u32);
}
Ok(())
},
@@ -578,12 +578,9 @@ pub fn dc_search_msgs(
.is_ok();
if success {
return ret;
return ret.as_ptr();
}
if !ret.is_null() {
unsafe { dc_array_unref(ret) };
}
std::ptr::null_mut()
}