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

Replace goto/current_block logic in dc_msg with OK_TO_CONTINUE approach. Keeps indentation

Browse Source
This commit is contained in:
jikstra
2019-07-29 16:30:42 +02:00
parent 188da2a020
commit ff3f96df48
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dc_msg.rs
View File

@@ -796,11 +796,12 @@ pub unsafe fn dc_msg_get_showpadlock(msg: *const dc_msg_t) -> libc::c_int {
0 0
} }
#[allow(non_snake_case)]
pub unsafe fn dc_msg_get_summary<'a>( 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 contact: *mut dc_contact_t = 0 as *mut dc_contact_t; let mut contact: *mut dc_contact_t = 0 as *mut dc_contact_t;
let mut chat_to_delete: *mut Chat = 0 as *mut Chat; let mut chat_to_delete: *mut Chat = 0 as *mut Chat;
@@ -808,24 +809,20 @@ 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;
} else { } else {
chat = chat_to_delete; chat = chat_to_delete;
current_block = 7815301370352969686; OK_TO_CONTINUE = false;
} }
} else { } else {
current_block = 7815301370352969686; OK_TO_CONTINUE = false;
} }
match current_block { if OK_TO_CONTINUE == false {
15204159476013091401 => {}
_ => {
if (*msg).from_id != 1 as libc::c_uint if (*msg).from_id != 1 as libc::c_uint
&& ((*chat).type_0 == 120 || (*chat).type_0 == 130) && ((*chat).type_0 == 120 || (*chat).type_0 == 130)
{ {
contact = dc_get_contact((*chat).context, (*msg).from_id) contact = dc_get_contact((*chat).context, (*msg).from_id)
} }
dc_lot_fill(ret, msg, chat, contact, (*msg).context); dc_lot_fill(ret, msg, chat, contact, (*msg).context);
}
} }
} }
dc_contact_unref(contact); dc_contact_unref(contact);