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

Return Vec instead of carray from dc_split_into_lines

Browse Source
This commit is contained in:
Alexander Krotov
2019-08-02 00:28:40 +03:00
parent 0a9f3ae160
commit d64fcece5b
4 changed files with 62 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/dc_contact.rs
View File

@@ -455,38 +455,29 @@ pub fn dc_add_or_lookup_contact(
#[allow(non_snake_case)]
pub unsafe fn dc_add_address_book(context: &Context, adr_book: *const libc::c_char) -> libc::c_int {
let mut lines: *mut carray = 0 as *mut carray;
let mut i: size_t;
let iCnt: size_t;
let mut sth_modified: libc::c_int = 0i32;
let mut modify_cnt: libc::c_int = 0i32;
if !(adr_book.is_null()) {
lines = dc_split_into_lines(adr_book);
if !lines.is_null() {
iCnt = carray_count(lines) as size_t;
i = 0i32 as size_t;
while i.wrapping_add(1) < iCnt {
let name: *mut libc::c_char =
carray_get(lines, i as libc::c_uint) as *mut libc::c_char;
let addr: *mut libc::c_char =
carray_get(lines, i.wrapping_add(1) as libc::c_uint) as *mut libc::c_char;
dc_normalize_name(name);
dc_add_or_lookup_contact(context, name, addr, 0x80000i32, &mut sth_modified);
if 0 != sth_modified {
modify_cnt += 1
}
i = (i as libc::c_ulong).wrapping_add(2i32 as libc::c_ulong) as size_t as size_t
}
if 0 != modify_cnt {
context.call_cb(
Event::CONTACTS_CHANGED,
0i32 as uintptr_t,
0i32 as uintptr_t,
);
let lines = dc_split_into_lines(adr_book);
for chunk in lines.chunks(2) {
let name: *mut libc::c_char = chunk[0];
let addr: *mut libc::c_char = chunk[1];
dc_normalize_name(name);
dc_add_or_lookup_contact(context, name, addr, 0x80000i32, &mut sth_modified);
if 0 != sth_modified {
modify_cnt += 1
}
}
if 0 != modify_cnt {
context.call_cb(
Event::CONTACTS_CHANGED,
0i32 as uintptr_t,
0i32 as uintptr_t,
);
}
dc_free_splitted_lines(lines);
}
dc_free_splitted_lines(lines);
modify_cnt
}