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

Refactor dc_extract_grpid_from_rfc724_mid_list and rename test

Browse Source
This commit is contained in:
jikstra
2019-08-03 14:47:24 +02:00
committed by Floris Bruynooghe
parent 282f964f2f
commit d5168916df
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dc_tools.rs
View File

@@ -821,9 +821,9 @@ pub fn dc_extract_grpid_from_rfc724_mid_r(mid: String) -> Option<String> {
None None
} }
pub fn dc_extract_grpid_from_rfc724_mid(mid: *const libc::c_char) -> *mut libc::c_char { pub unsafe fn dc_extract_grpid_from_rfc724_mid(mid: *const libc::c_char) -> *mut libc::c_char {
if let Some(grpid) = dc_extract_grpid_from_rfc724_mid_r(to_string(mid)) { if let Some(grpid) = dc_extract_grpid_from_rfc724_mid_r(to_string(mid)) {
return unsafe { to_cstring(grpid) }; return to_cstring(grpid);
} }
0 as *mut libc::c_char 0 as *mut libc::c_char
} }
@@ -832,14 +832,14 @@ pub unsafe fn dc_extract_grpid_from_rfc724_mid_list(list: *const clist) -> *mut
if !list.is_null() { if !list.is_null() {
let mut cur: *mut clistiter = (*list).first; let mut cur: *mut clistiter = (*list).first;
while !cur.is_null() { while !cur.is_null() {
let mid: *const libc::c_char = (if !cur.is_null() { let mid = if !cur.is_null() {
(*cur).data to_string((*cur).data as *const libc::c_char)
} else { } else {
0 as *mut libc::c_void "".to_string()
}) as *const libc::c_char; };
let grpid = dc_extract_grpid_from_rfc724_mid_r(to_string(mid));
if !grpid.is_none() { if let Some(grpid) = dc_extract_grpid_from_rfc724_mid_r(mid) {
return to_cstring(grpid.unwrap()); return to_cstring(grpid);
} }
cur = if !cur.is_null() { cur = if !cur.is_null() {
(*cur).next (*cur).next
@@ -2119,7 +2119,7 @@ mod tests {
} }
#[test] #[test]
fn test_dto_cstringto_cstringc_extract_grpid_from_rfc724_mid() { fn test_dc_extract_grpid_from_rfc724_mid() {
unsafe { unsafe {
// Should return 0 if we pass invalid mid // Should return 0 if we pass invalid mid
let str = b"foobar\x00" as *const u8 as *const libc::c_char; let str = b"foobar\x00" as *const u8 as *const libc::c_char;