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

Merge pull request #488 from KAction/transfer

Browse Source 
Reduce indentation in dc_continue_key_transfer
This commit is contained in:
Alexander Krotov
2019-09-11 05:36:02 +00:00
committed by GitHub
parent 995548002b 2eda839303
commit 68b5e34fed
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/dc_imex.rs
View File

@@ -274,44 +274,46 @@ pub unsafe fn dc_continue_key_transfer(
let mut filebytes: size_t = 0i32 as size_t; let mut filebytes: size_t = 0i32 as size_t;
let mut armored_key: *mut libc::c_char = ptr::null_mut(); let mut armored_key: *mut libc::c_char = ptr::null_mut();
let mut norm_sc: *mut libc::c_char = ptr::null_mut(); let mut norm_sc: *mut libc::c_char = ptr::null_mut();
if !(msg_id <= 9i32 as libc::c_uint || setup_code.is_null()) { if msg_id <= 9i32 as libc::c_uint || setup_code.is_null() {
let msg = dc_get_msg(context, msg_id); return false;
if msg.is_err() }
|| !dc_msg_is_setupmessage(msg.as_ref().unwrap()) let msg = dc_get_msg(context, msg_id);
|| { if msg.is_err()
filename = dc_msg_get_file(msg.as_ref().unwrap()); || !dc_msg_is_setupmessage(msg.as_ref().unwrap())
filename.is_null() || {
} filename = dc_msg_get_file(msg.as_ref().unwrap());
|| *filename.offset(0isize) as libc::c_int == 0i32 filename.is_null()
{ }
error!(context, "Message is no Autocrypt Setup Message.",); || *filename.offset(0isize) as libc::c_int == 0i32
} else if 0 {
== dc_read_file( error!(context, "Message is no Autocrypt Setup Message.",);
context, } else if 0
filename, == dc_read_file(
&mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void, context,
&mut filebytes, filename,
) &mut filecontent as *mut *mut libc::c_char as *mut *mut libc::c_void,
|| filecontent.is_null() &mut filebytes,
|| filebytes <= 0 )
{ || filecontent.is_null()
error!(context, "Cannot read Autocrypt Setup Message file.",); || filebytes <= 0
{
error!(context, "Cannot read Autocrypt Setup Message file.",);
} else {
norm_sc = dc_normalize_setup_code(context, setup_code);
if norm_sc.is_null() {
warn!(context, "Cannot normalize Setup Code.",);
} else { } else {
norm_sc = dc_normalize_setup_code(context, setup_code); armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent);
if norm_sc.is_null() { if armored_key.is_null() {
warn!(context, "Cannot normalize Setup Code.",); warn!(context, "Cannot decrypt Autocrypt Setup Message.",);
} else { } else if set_self_key(context, armored_key, 1) {
armored_key = dc_decrypt_setup_file(context, norm_sc, filecontent); /*set default*/
if armored_key.is_null() { /* error already logged */
warn!(context, "Cannot decrypt Autocrypt Setup Message.",); success = true
} else if set_self_key(context, armored_key, 1) {
/*set default*/
/* error already logged */
success = true
}
} }
} }
} }
free(armored_key as *mut libc::c_void); free(armored_key as *mut libc::c_void);
free(filecontent as *mut libc::c_void); free(filecontent as *mut libc::c_void);
free(filename as *mut libc::c_void); free(filename as *mut libc::c_void);