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

replace goto with ok_to_continue

Browse Source
This commit is contained in:
Simon Laux
2019-08-08 00:32:34 +02:00
committed by holger krekel
parent 1c5d07a29f
commit 125df968d2
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dc_msg.rs
View File

@@ -786,7 +786,7 @@ pub unsafe fn dc_msg_get_summary<'a>(
msg: *mut dc_msg_t<'a>, msg: *mut dc_msg_t<'a>,
mut chat: *const Chat<'a>, mut chat: *const Chat<'a>,
) -> *mut dc_lot_t { ) -> *mut dc_lot_t {
let current_block: u64; let mut ok_to_continue = true;
let ret: *mut dc_lot_t = dc_lot_new(); let ret: *mut dc_lot_t = dc_lot_new();
let mut chat_to_delete: *mut Chat = 0 as *mut Chat; let mut chat_to_delete: *mut Chat = 0 as *mut Chat;
@@ -794,17 +794,12 @@ pub unsafe fn dc_msg_get_summary<'a>(
if chat.is_null() { if chat.is_null() {
chat_to_delete = dc_get_chat((*msg).context, (*msg).chat_id); chat_to_delete = dc_get_chat((*msg).context, (*msg).chat_id);
if chat_to_delete.is_null() { if chat_to_delete.is_null() {
current_block = 15204159476013091401; ok_to_continue = false;
} else { } else {
chat = chat_to_delete; chat = chat_to_delete;
current_block = 7815301370352969686;
} }
} else {
current_block = 7815301370352969686;
} }
match current_block { if ok_to_continue {
15204159476013091401 => {}
_ => {
let contact = if (*msg).from_id != DC_CONTACT_ID_SELF as libc::c_uint let contact = if (*msg).from_id != DC_CONTACT_ID_SELF as libc::c_uint
&& ((*chat).type_0 == 120 || (*chat).type_0 == 130) && ((*chat).type_0 == 120 || (*chat).type_0 == 130)
{ {
@@ -814,7 +809,6 @@ pub unsafe fn dc_msg_get_summary<'a>(
}; };
dc_lot_fill(ret, msg, chat, contact.as_ref(), (*msg).context); dc_lot_fill(ret, msg, chat, contact.as_ref(), (*msg).context);
}
} }
} }