From 50c592e41ff905b716e1382710d28c3617d8b166 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Mon, 12 Aug 2019 05:41:24 +0200 Subject: [PATCH] convert current_block to goto and remove UDC* *Unreachable Duplicated Code (I made that shortcut up) --- src/dc_job.rs | 190 ++++++++++---------------------------------------- 1 file changed, 37 insertions(+), 153 deletions(-) diff --git a/src/dc_job.rs b/src/dc_job.rs index 894f7a2d7..50cb515e7 100644 --- a/src/dc_job.rs +++ b/src/dc_job.rs @@ -292,7 +292,7 @@ unsafe fn dc_suspend_smtp_thread(context: &Context, suspend: bool) { #[allow(non_snake_case)] unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { - let mut current_block: u64; + let ok_to_continue; let mut filename: *mut libc::c_char = 0 as *mut libc::c_char; let mut buf: *mut libc::c_void = 0 as *mut libc::c_void; let mut buf_bytes: size_t = 0i32 as size_t; @@ -304,15 +304,14 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { if !connected { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - current_block = 14216916617354591294; + ok_to_continue = false; } else { - current_block = 13109137661213826276; + ok_to_continue = true; } } else { - current_block = 13109137661213826276; + ok_to_continue = true; } - match current_block { - 13109137661213826276 => { + if ok_to_continue { let filename_s = job.param.get(Param::File).unwrap_or_default(); filename = filename_s.strdup(); if strlen(filename) == 0 { @@ -336,6 +335,7 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { /* if there is a msg-id and it does not exist in the db, cancel sending. this happends if dc_delete_msgs() was called before the generated mime was sent out */ + let ok_to_continue1; if 0 != job.foreign_id { if 0 == dc_msg_exists(context, job.foreign_id) { warn!( @@ -345,16 +345,14 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { job.foreign_id, job.job_id, ); - current_block = 14216916617354591294; + ok_to_continue1 = false; } else { - current_block = 11194104282611034094; + ok_to_continue1 = true; } } else { - current_block = 11194104282611034094; + ok_to_continue1 = true; } - match current_block { - 14216916617354591294 => {} - _ => { + if ok_to_continue1 { /* send message */ let body = std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec(); @@ -393,12 +391,9 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) { ); } } - } } } } - } - _ => {} } free(buf); free(filename as *mut libc::c_void); @@ -417,7 +412,7 @@ pub unsafe fn dc_job_try_again_later( #[allow(non_snake_case)] unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) { - let mut current_block: u64; + let ok_to_continue; let msg = dc_msg_new_untyped(context); let mut dest_uid: uint32_t = 0i32 as uint32_t; @@ -427,15 +422,14 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) { connect_to_inbox(context, &inbox); if !inbox.is_connected() { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - current_block = 2238328302157162973; + ok_to_continue = false; } else { - current_block = 2473556513754201174; + ok_to_continue = true; } } else { - current_block = 2473556513754201174; + ok_to_continue = true; } - match current_block { - 2473556513754201174 => { + if ok_to_continue { if dc_msg_load_from_db(msg, context, job.foreign_id) { if context .sql @@ -459,43 +453,20 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) { ) as libc::c_uint { 1 => { - current_block = 6379107252614456477; - match current_block { - 12072121998757195963 => { - dc_update_server_uid( - context, - (*msg).rfc724_mid, - &dest_folder, - dest_uid, - ); - } - _ => { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - } - } } 3 => { - current_block = 12072121998757195963; - match current_block { - 12072121998757195963 => { dc_update_server_uid( context, (*msg).rfc724_mid, &dest_folder, dest_uid, ); - } - _ => { - dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - } - } } 0 | 2 | _ => {} } } } - } - _ => {} } dc_msg_unref(msg); @@ -514,7 +485,7 @@ fn connect_to_inbox(context: &Context, inbox: &Imap) -> libc::c_int { #[allow(non_snake_case)] unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_job_t) { - let current_block: u64; + let ok_to_continue; let folder = job .param .get(Param::ServerFolder) @@ -528,15 +499,14 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_ connect_to_inbox(context, &inbox); if !inbox.is_connected() { dc_job_try_again_later(job, 3, 0 as *const libc::c_char); - current_block = 2670689566614003383; + ok_to_continue = false; } else { - current_block = 11006700562992250127; + ok_to_continue = true; } } else { - current_block = 11006700562992250127; + ok_to_continue = true; } - match current_block { - 11006700562992250127 => { + if ok_to_continue { if inbox.set_seen(context, &folder, uid) == 0 { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); } @@ -558,14 +528,12 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_ } } } - } - _ => {} } } #[allow(non_snake_case)] unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) { - let mut current_block: u64; + let ok_to_continue; let msg: *mut dc_msg_t = dc_msg_new_untyped(context); let inbox = context.inbox.read().unwrap(); @@ -573,79 +541,22 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_ connect_to_inbox(context, &inbox); if !inbox.is_connected() { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - current_block = 17792648348530113339; + ok_to_continue = false; } else { - current_block = 15240798224410183470; + ok_to_continue = true; } } else { - current_block = 15240798224410183470; + ok_to_continue = true; } - match current_block { - 15240798224410183470 => { + if ok_to_continue { if dc_msg_load_from_db(msg, context, job.foreign_id) { let server_folder = (*msg).server_folder.as_ref().unwrap(); match inbox.set_seen(context, server_folder, (*msg).server_uid) as libc::c_uint { 0 => {} 1 => { - current_block = 12392248546350854223; - match current_block { - 12392248546350854223 => { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - } - _ => { - if 0 != (*msg).param.get_int(Param::WantsMdn).unwrap_or_default() - && 0 != context - .sql - .get_config_int(context, "mdns_enabled") - .unwrap_or_else(|| 1) - { - let folder = (*msg).server_folder.as_ref().unwrap(); - match inbox.set_mdnsent(context, folder, (*msg).server_uid) - as libc::c_uint - { - 1 => { - current_block = 4016212065805849280; - match current_block { - 6186957421461061791 => { - dc_send_mdn(context, (*msg).id); - } - _ => { - dc_job_try_again_later( - job, - 3i32, - 0 as *const libc::c_char, - ); - } - } - } - 3 => { - current_block = 6186957421461061791; - match current_block { - 6186957421461061791 => { - dc_send_mdn(context, (*msg).id); - } - _ => { - dc_job_try_again_later( - job, - 3i32, - 0 as *const libc::c_char, - ); - } - } - } - 0 | 2 | _ => {} - } - } - } - } } _ => { - current_block = 7746791466490516765; - match current_block { - 12392248546350854223 => { - dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - } - _ => { if 0 != (*msg).param.get_int(Param::WantsMdn).unwrap_or_default() && 0 != context .sql @@ -658,45 +569,21 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_ as libc::c_uint { 1 => { - current_block = 4016212065805849280; - match current_block { - 6186957421461061791 => { - dc_send_mdn(context, (*msg).id); - } - _ => { dc_job_try_again_later( job, 3i32, 0 as *const libc::c_char, ); - } - } } 3 => { - current_block = 6186957421461061791; - match current_block { - 6186957421461061791 => { dc_send_mdn(context, (*msg).id); - } - _ => { - dc_job_try_again_later( - job, - 3i32, - 0 as *const libc::c_char, - ); - } - } } 0 | 2 | _ => {} } } - } - } } } } - } - _ => {} } dc_msg_unref(msg); } @@ -863,7 +750,6 @@ pub unsafe fn dc_interrupt_imap_idle(context: &Context) { #[allow(non_snake_case)] unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_job_t) { - let mut current_block: u64; let mut delete_from_server: libc::c_int = 1i32; let msg: *mut dc_msg_t = dc_msg_new_untyped(context); let inbox = context.inbox.read().unwrap(); @@ -872,6 +758,7 @@ unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_jo || (*msg).rfc724_mid.is_null() || *(*msg).rfc724_mid.offset(0isize) as libc::c_int == 0i32) { + let ok_to_continue1; /* eg. device messages have no Message-ID */ if dc_rfc724_mid_cnt(context, (*msg).rfc724_mid) != 1i32 { info!( @@ -882,38 +769,35 @@ unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(context: &Context, job: &mut dc_jo } /* if this is the last existing part of the message, we delete the message from the server */ if 0 != delete_from_server { + let ok_to_continue; if !inbox.is_connected() { connect_to_inbox(context, &inbox); if !inbox.is_connected() { dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); - current_block = 8913536887710889399; + ok_to_continue = false; } else { - current_block = 5399440093318478209; + ok_to_continue = true; } } else { - current_block = 5399440093318478209; + ok_to_continue = true; } - match current_block { - 8913536887710889399 => {} - _ => { + if ok_to_continue { let mid = CStr::from_ptr((*msg).rfc724_mid).to_str().unwrap(); let server_folder = (*msg).server_folder.as_ref().unwrap(); if 0 == inbox.delete_msg(context, mid, server_folder, &mut (*msg).server_uid) { dc_job_try_again_later(job, -1i32, 0 as *const libc::c_char); - current_block = 8913536887710889399; + ok_to_continue1 = false; } else { - current_block = 17407779659766490442; + ok_to_continue1 = true; } - } + } else { + ok_to_continue1 = false; } } else { - current_block = 17407779659766490442; + ok_to_continue1 = true; } - match current_block { - 8913536887710889399 => {} - _ => { + if ok_to_continue1 { dc_delete_msg_from_db(context, (*msg).id); - } } } dc_msg_unref(msg);