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

convert another carray

Browse Source
This commit is contained in:
holger krekel
2019-07-09 21:04:23 +02:00
parent b93f5aa0b6
commit d67dd9cc33
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/dc_receive_imf.rs
View File

@@ -64,13 +64,13 @@ pub unsafe fn dc_receive_imf(
let mut mime_references: *mut libc::c_char = 0 as *mut libc::c_char; let mut mime_references: *mut libc::c_char = 0 as *mut libc::c_char;
let mut created_db_entries = Vec::new(); let mut created_db_entries = Vec::new();
let mut create_event_to_send = Some(Event::MSGS_CHANGED); let mut create_event_to_send = Some(Event::MSGS_CHANGED);
let rr_event_to_send: *mut carray = carray_new(16); let mut rr_event_to_send = Vec::new();
let mut txt_raw: *mut libc::c_char = 0 as *mut libc::c_char; let mut txt_raw: *mut libc::c_char = 0 as *mut libc::c_char;
let to_ids: *mut dc_array_t = dc_array_new(16); let to_ids: *mut dc_array_t = dc_array_new(16);
// XXX in theory the three carray's could be NULL pointer // XXX in theory the three carray's could be NULL pointer
// but we want to get rid of carray (and dc_array) anyway in favor of Rust Vectors // but we want to get rid of carray (and dc_array) anyway in favor of Rust Vectors
assert!(!rr_event_to_send.is_null() && !to_ids.is_null()); assert!(!to_ids.is_null());
info!( info!(
context, context,
0, 0,
@@ -772,18 +772,9 @@ pub unsafe fn dc_receive_imf(
&mut chat_id_0, &mut chat_id_0,
&mut msg_id, &mut msg_id,
) { ) {
carray_add( rr_event_to_send
rr_event_to_send, .push((chat_id_0, 0));
chat_id_0 as uintptr_t rr_event_to_send.push((msg_id, 0));
as *mut libc::c_void,
0 as *mut libc::c_uint,
);
carray_add(
rr_event_to_send,
msg_id as uintptr_t
as *mut libc::c_void,
0 as *mut libc::c_uint,
);
} }
mdn_consumed = (msg_id mdn_consumed = (msg_id
!= 0i32 as libc::c_uint) != 0i32 as libc::c_uint)
@@ -895,19 +886,9 @@ pub unsafe fn dc_receive_imf(
context.call_cb(create_event_to_send, *msg_id as usize, *insert_id as usize); context.call_cb(create_event_to_send, *msg_id as usize, *insert_id as usize);
} }
} }
if !rr_event_to_send.is_null() { for ev in &rr_event_to_send {
let mut i_1: size_t; let (chat_id, msg_id) = ev;
let icnt_1: size_t = carray_count(rr_event_to_send) as size_t; context.call_cb(Event::MSG_READ, *chat_id as uintptr_t, *msg_id as uintptr_t);
i_1 = 0i32 as size_t;
while i_1 < icnt_1 {
context.call_cb(
Event::MSG_READ,
carray_get(rr_event_to_send, i_1 as libc::c_uint) as uintptr_t,
carray_get(rr_event_to_send, i_1.wrapping_add(1) as libc::c_uint) as uintptr_t,
);
i_1 = (i_1 as libc::c_ulong).wrapping_add(2i32 as libc::c_ulong) as size_t as size_t
}
carray_free(rr_event_to_send);
} }
free(txt_raw as *mut libc::c_void); free(txt_raw as *mut libc::c_void);
sqlite3_finalize(stmt); sqlite3_finalize(stmt);