cargo fmt

This commit is contained in:
Simon Laux
2019-08-12 05:42:02 +02:00
parent 50c592e41f
commit 9e30df4b43

View File

@@ -340,10 +340,7 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
if 0 == dc_msg_exists(context, job.foreign_id) { if 0 == dc_msg_exists(context, job.foreign_id) {
warn!( warn!(
context, context,
0, 0, "Message {} for job {} does not exist", job.foreign_id, job.job_id,
"Message {} for job {} does not exist",
job.foreign_id,
job.job_id,
); );
ok_to_continue1 = false; ok_to_continue1 = false;
} else { } else {
@@ -354,13 +351,13 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
} }
if ok_to_continue1 { if ok_to_continue1 {
/* send message */ /* send message */
let body = let body = std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec();
std::slice::from_raw_parts(buf as *const u8, buf_bytes).to_vec(); if 0 == context
if 0 == context.smtp.lock().unwrap().send( .smtp
context, .lock()
recipients_list, .unwrap()
body, .send(context, recipients_list, body)
) { {
context.smtp.lock().unwrap().disconnect(); context.smtp.lock().unwrap().disconnect();
dc_job_try_again_later( dc_job_try_again_later(
job, job,
@@ -370,11 +367,7 @@ unsafe fn dc_job_do_DC_JOB_SEND(context: &Context, job: &mut dc_job_t) {
} else { } else {
dc_delete_file(context, filename_s); dc_delete_file(context, filename_s);
if 0 != job.foreign_id { if 0 != job.foreign_id {
dc_update_msg_state( dc_update_msg_state(context, job.foreign_id, DC_STATE_OUT_DELIVERED);
context,
job.foreign_id,
DC_STATE_OUT_DELIVERED,
);
let chat_id: i32 = context let chat_id: i32 = context
.sql .sql
.query_row_col( .query_row_col(
@@ -456,12 +449,7 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char); dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
} }
3 => { 3 => {
dc_update_server_uid( dc_update_server_uid(context, (*msg).rfc724_mid, &dest_folder, dest_uid);
context,
(*msg).rfc724_mid,
&dest_folder,
dest_uid,
);
} }
0 | 2 | _ => {} 0 | 2 | _ => {}
} }
@@ -521,9 +509,7 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
} }
let dest_folder = context.sql.get_config(context, "configured_mvbox_folder"); let dest_folder = context.sql.get_config(context, "configured_mvbox_folder");
if let Some(dest_folder) = dest_folder { if let Some(dest_folder) = dest_folder {
if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid) as libc::c_uint {
as libc::c_uint
{
dc_job_try_again_later(job, 3, 0 as *const libc::c_char); dc_job_try_again_later(job, 3, 0 as *const libc::c_char);
} }
} }
@@ -565,15 +551,10 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(context: &Context, job: &mut dc_
{ {
let folder = (*msg).server_folder.as_ref().unwrap(); let folder = (*msg).server_folder.as_ref().unwrap();
match inbox.set_mdnsent(context, folder, (*msg).server_uid) match inbox.set_mdnsent(context, folder, (*msg).server_uid) as libc::c_uint
as libc::c_uint
{ {
1 => { 1 => {
dc_job_try_again_later( dc_job_try_again_later(job, 3i32, 0 as *const libc::c_char);
job,
3i32,
0 as *const libc::c_char,
);
} }
3 => { 3 => {
dc_send_mdn(context, (*msg).id); dc_send_mdn(context, (*msg).id);