Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make dc_split_armored_data return bool (#251)

Browse Source 
* Make dc_split_armored_data return bool

* Remove double negations
This commit is contained in:
Alexander Krotov
2019-07-30 09:46:36 +03:00
committed by Lars-Magnus Skog
parent 9314a5a8fd
commit 707c8c2830
4 changed files with 65 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/dc_imex.rs
View File

@@ -462,20 +462,18 @@ pub unsafe fn dc_decrypt_setup_file(
let mut payload: *mut libc::c_char = 0 as *mut libc::c_char;
fc_buf = dc_strdup(filecontent);
if !(0
== dc_split_armored_data(
fc_buf,
&mut fc_headerline,
0 as *mut *const libc::c_char,
0 as *mut *const libc::c_char,
&mut fc_base64,
)
|| fc_headerline.is_null()
|| strcmp(
if dc_split_armored_data(
fc_buf,
&mut fc_headerline,
0 as *mut *const libc::c_char,
0 as *mut *const libc::c_char,
&mut fc_base64,
) && !fc_headerline.is_null()
&& strcmp(
fc_headerline,
b"-----BEGIN PGP MESSAGE-----\x00" as *const u8 as *const libc::c_char,
) != 0i32
|| fc_base64.is_null())
) == 0
&& !fc_base64.is_null()
{
/* convert base64 to binary */
/*must be freed using mmap_string_unref()*/
@@ -1154,7 +1152,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
private_key = buf;
free(buf2 as *mut libc::c_void);
buf2 = dc_strdup(buf);
if 0 != dc_split_armored_data(
if dc_split_armored_data(
buf2,
&mut buf2_headerline,
0 as *mut *const libc::c_char,