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

Remove gotos from create_or_lookup_adhoc_group commit

Browse Source
This commit is contained in:
jikstra
2019-08-07 21:41:06 +02:00
parent 4d9bd46c9d
commit 183cb08bee
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dc_receive_imf.rs
View File

@@ -1344,7 +1344,7 @@ unsafe fn create_or_lookup_adhoc_group(
ret_chat_id: *mut uint32_t, ret_chat_id: *mut uint32_t,
ret_chat_id_blocked: *mut libc::c_int, ret_chat_id_blocked: *mut libc::c_int,
) { ) {
let current_block: u64; let mut ok_to_continue = true;
/* if we're here, no grpid was found, check there is an existing ad-hoc /* if we're here, no grpid was found, check there is an existing ad-hoc
group matching the to-list or if we can create one */ group matching the to-list or if we can create one */
let mut member_ids: *mut dc_array_t = 0 as *mut dc_array_t; let mut member_ids: *mut dc_array_t = 0 as *mut dc_array_t;
@@ -1386,16 +1386,10 @@ unsafe fn create_or_lookup_adhoc_group(
chat_id = id as u32; chat_id = id as u32;
chat_id_blocked = id_blocked; chat_id_blocked = id_blocked;
/* success, chat found */ /* success, chat found */
current_block = 11334989263469503965; ok_to_continue = false;
} else {
current_block = 11194104282611034094;
} }
} else {
current_block = 11194104282611034094;
} }
match current_block { if ok_to_continue {
11334989263469503965 => {}
_ => {
if !(0 == allow_creation) { if !(0 == allow_creation) {
/* we do not check if the message is a reply to another group, this may result in /* we do not check if the message is a reply to another group, this may result in
chats with unclear member list. instead we create a new group in the following lines ... */ chats with unclear member list. instead we create a new group in the following lines ... */
@@ -1437,7 +1431,6 @@ unsafe fn create_or_lookup_adhoc_group(
} }
} }
} }
}
dc_array_unref(member_ids); dc_array_unref(member_ids);
dc_array_unref(chat_ids); dc_array_unref(chat_ids);
free(chat_ids_str as *mut libc::c_void); free(chat_ids_str as *mut libc::c_void);