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

Return bool from export_key_to_asc_file

Browse Source
This commit is contained in:
Alexander Krotov
2019-09-12 12:56:51 +03:00
parent 3932d8f48f
commit 27a4adb9c6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dc_imex.rs
View File

@@ -1026,14 +1026,14 @@ unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool
for key_pair in keys { for key_pair in keys {
let (id, public_key, private_key, is_default) = key_pair?; let (id, public_key, private_key, is_default) = key_pair?;
if let Some(key) = public_key { if let Some(key) = public_key {
if 0 == export_key_to_asc_file(context, dir, id, &key, is_default) { if export_key_to_asc_file(context, dir, id, &key, is_default) {
export_errors += 1; export_errors += 1;
} }
} else { } else {
export_errors += 1; export_errors += 1;
} }
if let Some(key) = private_key { if let Some(key) = private_key {
if 0 == export_key_to_asc_file(context, dir, id, &key, is_default) { if export_key_to_asc_file(context, dir, id, &key, is_default) {
export_errors += 1; export_errors += 1;
} }
} else { } else {
@@ -1052,15 +1052,14 @@ unsafe fn export_self_keys(context: &Context, dir: *const libc::c_char) -> bool
/******************************************************************************* /*******************************************************************************
* Classic key export * Classic key export
******************************************************************************/ ******************************************************************************/
// TODO should return bool /rtn
unsafe fn export_key_to_asc_file( unsafe fn export_key_to_asc_file(
context: &Context, context: &Context,
dir: *const libc::c_char, dir: *const libc::c_char,
id: libc::c_int, id: libc::c_int,
key: &Key, key: &Key,
is_default: libc::c_int, is_default: libc::c_int,
) -> libc::c_int { ) -> bool {
let mut success: libc::c_int = 0i32; let mut success = false;
let file_name; let file_name;
if 0 != is_default { if 0 != is_default {
file_name = dc_mprintf( file_name = dc_mprintf(
@@ -1094,7 +1093,7 @@ unsafe fn export_key_to_asc_file(
file_name as uintptr_t, file_name as uintptr_t,
0i32 as uintptr_t, 0i32 as uintptr_t,
); );
success = 1i32 success = true;
} }
free(file_name as *mut libc::c_void); free(file_name as *mut libc::c_void);