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

Remove redundant checks in prepare_msg_raw()

Browse Source
This commit is contained in:
Dmitry Bogatov
2019-09-06 23:24:39 +00:00
parent 1062ac6ade
commit 1f82ba74aa
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/chat.rs
View File

@@ -379,21 +379,14 @@ impl<'a> Chat<'a> {
let parent_in_reply_to = parent_in_reply_to.strdup(); let parent_in_reply_to = parent_in_reply_to.strdup();
let parent_references = parent_references.strdup(); let parent_references = parent_references.strdup();
if !parent_rfc724_mid.is_null() if 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int {
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
{
new_in_reply_to = dc_strdup(parent_rfc724_mid) new_in_reply_to = dc_strdup(parent_rfc724_mid)
} }
if !parent_references.is_null() { let space = strchr(parent_references, ' ' as i32);
let space: *mut libc::c_char; if !space.is_null() {
space = strchr(parent_references, ' ' as i32); *space = 0 as libc::c_char
if !space.is_null() {
*space = 0 as libc::c_char
}
} }
if !parent_references.is_null() if 0 != *parent_references.offset(0isize) as libc::c_int
&& 0 != *parent_references.offset(0isize) as libc::c_int
&& !parent_rfc724_mid.is_null()
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int && 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
{ {
new_references = dc_mprintf( new_references = dc_mprintf(
@@ -401,13 +394,9 @@ impl<'a> Chat<'a> {
parent_references, parent_references,
parent_rfc724_mid, parent_rfc724_mid,
) )
} else if !parent_references.is_null() } else if 0 != *parent_references.offset(0isize) as libc::c_int {
&& 0 != *parent_references.offset(0isize) as libc::c_int
{
new_references = dc_strdup(parent_references) new_references = dc_strdup(parent_references)
} else if !parent_in_reply_to.is_null() } else if 0 != *parent_in_reply_to.offset(0isize) as libc::c_int
&& 0 != *parent_in_reply_to.offset(0isize) as libc::c_int
&& !parent_rfc724_mid.is_null()
&& 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int && 0 != *parent_rfc724_mid.offset(0isize) as libc::c_int
{ {
new_references = dc_mprintf( new_references = dc_mprintf(
@@ -415,9 +404,7 @@ impl<'a> Chat<'a> {
parent_in_reply_to, parent_in_reply_to,
parent_rfc724_mid, parent_rfc724_mid,
) )
} else if !parent_in_reply_to.is_null() } else if 0 != *parent_in_reply_to.offset(0isize) as libc::c_int {
&& 0 != *parent_in_reply_to.offset(0isize) as libc::c_int
{
new_references = dc_strdup(parent_in_reply_to) new_references = dc_strdup(parent_in_reply_to)
} }
free(parent_rfc724_mid as *mut libc::c_void); free(parent_rfc724_mid as *mut libc::c_void);