From 3932d8f48f3701734cce9f592830882703482e5c Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Thu, 12 Sep 2019 12:55:48 +0300 Subject: [PATCH] Return bool from export_self_keys --- src/dc_imex.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/dc_imex.rs b/src/dc_imex.rs index 0b189965d..abe035fbf 100644 --- a/src/dc_imex.rs +++ b/src/dc_imex.rs @@ -520,7 +520,7 @@ pub unsafe fn dc_job_do_DC_JOB_IMEX_IMAP(context: &Context, job: &Job) { if ok_to_continue { match what { 1 => { - if 0 != export_self_keys(context, param1.as_ptr()) { + if export_self_keys(context, param1.as_ptr()) { info!(context, "Import/export completed.",); success = 1 } @@ -1004,8 +1004,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) -> imported_cnt } -// TODO should return bool /rtn -unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> libc::c_int { +unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool { let mut export_errors = 0; context @@ -1047,11 +1046,7 @@ unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> libc: ) .unwrap(); - if export_errors == 0 { - 1 - } else { - 0 - } + export_errors == 0 } /*******************************************************************************