From 71a01d3002db940185e77b5e50dd7fcf1e80e2e4 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 11 Sep 2019 02:12:35 +0000 Subject: [PATCH] Reduce indentation in dc_continue_key_transfer Replace `if (ok) { }` pattern with `if (!ok) return` to reduce indentation level. Note: This commit fails CI due incorrect formatting. It is done deliberately to simplify review process. --- src/dc_imex.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dc_imex.rs b/src/dc_imex.rs index 48d822e38..954f8b66e 100644 --- a/src/dc_imex.rs +++ b/src/dc_imex.rs @@ -274,7 +274,9 @@ pub unsafe fn dc_continue_key_transfer( let mut filebytes: size_t = 0i32 as size_t; let mut armored_key: *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() { + return false; + } let msg = dc_get_msg(context, msg_id); if msg.is_err() || !dc_msg_is_setupmessage(msg.as_ref().unwrap()) @@ -311,7 +313,7 @@ pub unsafe fn dc_continue_key_transfer( } } } - } + free(armored_key as *mut libc::c_void); free(filecontent as *mut libc::c_void); free(filename as *mut libc::c_void);