Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 18:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor(mmime): rustify mailbox_list

Browse Source
This commit is contained in:
dignifiedquire
2019-09-28 14:35:33 -06:00
parent 8aa1a0cb3a
commit c18bdc39e5
6 changed files with 57 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dc_mimeparser.rs
View File

@@ -839,14 +839,12 @@ impl<'a> MimeParser<'a> {
fld_from.is_null()
}
|| (*fld_from).frm_mb_list.is_null()
|| (*(*fld_from).frm_mb_list).mb_list.is_null()
|| (*(*(*fld_from).frm_mb_list).mb_list).count != 1i32)
|| (*(*(*fld_from).frm_mb_list).0).len() != 1)
{
let mb = (if !(*(*(*fld_from).frm_mb_list).mb_list).first.is_null() {
(*(*(*(*fld_from).frm_mb_list).mb_list).first).data
} else {
ptr::null_mut()
}) as *mut mailimf_mailbox;
let mb = (*(*(*fld_from).frm_mb_list).0)
.first()
.map(|v| *v)
.unwrap_or_else(|| ptr::null_mut());
if !mb.is_null() {
let from_addr_norm = addr_normalize(as_str((*mb).mb_addr_spec));
@@ -916,8 +914,8 @@ pub fn mailimf_find_first_addr(mb_list: *const mailimf_mailbox_list) -> Option<S
return None;
}
for cur in unsafe { (*(*mb_list).mb_list).into_iter() } {
let mb = cur as *mut mailimf_mailbox;
for mb in unsafe { &(*mb_list).0 } {
let mb = *mb;
if !mb.is_null() && !unsafe { (*mb).mb_addr_spec.is_null() } {
let addr = unsafe { as_str((*mb).mb_addr_spec) };
return Some(addr_normalize(addr).to_string());
@@ -1259,11 +1257,8 @@ pub fn mailimf_get_recipients(imffields: *mut mailimf_fields) -> HashSet<String>
}
mailimf_address::Group(group) => {
if !group.is_null() && unsafe { !(*group).mb_list.is_null() } {
for cur3 in unsafe { &(*(*(*group).mb_list).mb_list) } {
mailimf_get_recipients_add_addr(
&mut recipients,
cur3 as *mut mailimf_mailbox,
);
for mb in unsafe { &((*(*group).mb_list).0) } {
mailimf_get_recipients_add_addr(&mut recipients, *mb);
}
}
}

14
src/dc_receive_imf.rs
View File

@@ -1901,13 +1901,8 @@ unsafe fn dc_add_or_lookup_contacts_by_mailbox_list(
if mb_list.is_null() {
return;
}
let mut cur: *mut clistiter = (*(*mb_list).mb_list).first;
while !cur.is_null() {
let mb: *mut mailimf_mailbox = (if !cur.is_null() {
(*cur).data
} else {
ptr::null_mut()
}) as *mut mailimf_mailbox;
for mb in &(*mb_list).0 {
let mb = *mb;
if !mb.is_null() {
add_or_lookup_contact_by_addr(
context,
@@ -1918,11 +1913,6 @@ unsafe fn dc_add_or_lookup_contacts_by_mailbox_list(
check_self,
);
}
cur = if !cur.is_null() {
(*cur).next
} else {
ptr::null_mut()
}
}
}