From cf49acff67b56957b9ba8a050aaf48d3604173c5 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Thu, 8 Aug 2019 01:09:41 +0200 Subject: [PATCH] part 2 --- src/dc_imex.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/dc_imex.rs b/src/dc_imex.rs index 4867c458c..e45a634c6 100644 --- a/src/dc_imex.rs +++ b/src/dc_imex.rs @@ -508,7 +508,7 @@ pub unsafe fn dc_normalize_setup_code( #[allow(non_snake_case)] pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: *mut dc_job_t) { - let mut ok_to_continue1 = true; + let mut ok_to_continue = true; let mut success: libc::c_int = 0; let mut ongoing_allocated_here: libc::c_int = 0; let what: libc::c_int; @@ -536,37 +536,33 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: *mut dc_job_t) 0, "Import/export: Cannot create private key or private key not available.", ); - ok_to_continue1 = false; + ok_to_continue = false; } else { dc_create_folder(context, ¶m1_s); } } - if ok_to_continue1 { + if ok_to_continue { match what { 1 => { - if 0 == export_self_keys(context, param1.as_ptr()) { - } else { + if 0 != export_self_keys(context, param1.as_ptr()) { info!(context, 0, "Import/export completed.",); success = 1 } } 2 => { - if 0 == import_self_keys(context, param1.as_ptr()) { - } else { + if 0 != import_self_keys(context, param1.as_ptr()) { info!(context, 0, "Import/export completed.",); success = 1 } } 11 => { - if 0 == export_backup(context, param1.as_ptr()) { - } else { + if 0 != export_backup(context, param1.as_ptr()) { info!(context, 0, "Import/export completed.",); success = 1 } } 12 => { - if 0 == import_backup(context, param1.as_ptr()) { - } else { + if 0 != import_backup(context, param1.as_ptr()) { info!(context, 0, "Import/export completed.",); success = 1 }