remove extern c and no_mangle

This commit is contained in:
dignifiedquire
2019-04-27 01:42:58 +03:00
parent 9a1fcc745e
commit 1faf248e09
54 changed files with 789 additions and 1579 deletions

View File

@@ -45,8 +45,7 @@ pub struct dc_job_t {
pub pending_error: *mut libc::c_char,
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_imap_jobs(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_imap_jobs(mut context: *mut dc_context_t) {
dc_log_info(
context,
0i32,
@@ -64,7 +63,7 @@ pub unsafe extern "C" fn dc_perform_imap_jobs(mut context: *mut dc_context_t) {
b"INBOX-jobs ended.\x00" as *const u8 as *const libc::c_char,
);
}
unsafe extern "C" fn dc_job_perform(
unsafe fn dc_job_perform(
mut context: *mut dc_context_t,
mut thread: libc::c_int,
mut probe_network: libc::c_int,
@@ -243,7 +242,7 @@ unsafe extern "C" fn dc_job_perform(
free(job.pending_error as *mut libc::c_void);
sqlite3_finalize(select_stmt);
}
unsafe extern "C" fn dc_job_delete(mut context: *mut dc_context_t, mut job: *const dc_job_t) {
unsafe fn dc_job_delete(mut context: *mut dc_context_t, mut job: *const dc_job_t) {
let mut delete_stmt: *mut sqlite3_stmt = dc_sqlite3_prepare(
(*context).sql,
b"DELETE FROM jobs WHERE id=?;\x00" as *const u8 as *const libc::c_char,
@@ -255,7 +254,7 @@ unsafe extern "C" fn dc_job_delete(mut context: *mut dc_context_t, mut job: *con
/* ******************************************************************************
* Tools
******************************************************************************/
unsafe extern "C" fn get_backoff_time_offset(mut c_tries: libc::c_int) -> time_t {
unsafe fn get_backoff_time_offset(mut c_tries: libc::c_int) -> time_t {
// results in ~3 weeks for the last backoff timespan
let mut N: time_t = pow(2i32 as libc::c_double, (c_tries - 1i32) as libc::c_double) as time_t;
N = N * 60i32 as libc::c_long;
@@ -265,7 +264,7 @@ unsafe extern "C" fn get_backoff_time_offset(mut c_tries: libc::c_int) -> time_t
}
return seconds;
}
unsafe extern "C" fn dc_job_update(mut context: *mut dc_context_t, mut job: *const dc_job_t) {
unsafe fn dc_job_update(mut context: *mut dc_context_t, mut job: *const dc_job_t) {
let mut stmt: *mut sqlite3_stmt = dc_sqlite3_prepare(
(*context).sql,
b"UPDATE jobs SET desired_timestamp=?, tries=?, param=? WHERE id=?;\x00" as *const u8
@@ -278,10 +277,7 @@ unsafe extern "C" fn dc_job_update(mut context: *mut dc_context_t, mut job: *con
sqlite3_step(stmt);
sqlite3_finalize(stmt);
}
unsafe extern "C" fn dc_suspend_smtp_thread(
mut context: *mut dc_context_t,
mut suspend: libc::c_int,
) {
unsafe fn dc_suspend_smtp_thread(mut context: *mut dc_context_t, mut suspend: libc::c_int) {
pthread_mutex_lock(&mut (*context).smtpidle_condmutex);
(*context).smtp_suspended = suspend;
pthread_mutex_unlock(&mut (*context).smtpidle_condmutex);
@@ -434,8 +430,7 @@ unsafe extern "C" fn dc_job_do_DC_JOB_SEND(mut context: *mut dc_context_t, mut j
free(filename as *mut libc::c_void);
}
// this value does not increase the number of tries
#[no_mangle]
pub unsafe extern "C" fn dc_job_try_again_later(
pub unsafe fn dc_job_try_again_later(
mut job: *mut dc_job_t,
mut try_again: libc::c_int,
mut pending_error: *const libc::c_char,
@@ -447,10 +442,7 @@ pub unsafe extern "C" fn dc_job_try_again_later(
free((*job).pending_error as *mut libc::c_void);
(*job).pending_error = dc_strdup_keep_null(pending_error);
}
unsafe extern "C" fn dc_job_do_DC_JOB_MOVE_MSG(
mut context: *mut dc_context_t,
mut job: *mut dc_job_t,
) {
unsafe fn dc_job_do_DC_JOB_MOVE_MSG(mut context: *mut dc_context_t, mut job: *mut dc_job_t) {
let mut current_block: u64;
let mut msg: *mut dc_msg_t = dc_msg_new_untyped(context);
let mut dest_folder: *mut libc::c_char = 0 as *mut libc::c_char;
@@ -534,7 +526,7 @@ unsafe extern "C" fn dc_job_do_DC_JOB_MOVE_MSG(
/* ******************************************************************************
* IMAP-jobs
******************************************************************************/
unsafe extern "C" fn connect_to_inbox(mut context: *mut dc_context_t) -> libc::c_int {
unsafe fn connect_to_inbox(mut context: *mut dc_context_t) -> libc::c_int {
let mut ret_connected: libc::c_int = 0i32;
ret_connected = dc_connect_to_configured_imap(context, (*context).inbox);
if !(0 == ret_connected) {
@@ -545,7 +537,7 @@ unsafe extern "C" fn connect_to_inbox(mut context: *mut dc_context_t) -> libc::c
}
return ret_connected;
}
unsafe extern "C" fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(
unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(
mut context: *mut dc_context_t,
mut job: *mut dc_job_t,
) {
@@ -602,7 +594,7 @@ unsafe extern "C" fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(
free(folder as *mut libc::c_void);
free(dest_folder as *mut libc::c_void);
}
unsafe extern "C" fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(
unsafe fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(
mut context: *mut dc_context_t,
mut job: *mut dc_job_t,
) {
@@ -745,7 +737,7 @@ unsafe extern "C" fn dc_job_do_DC_JOB_MARKSEEN_MSG_ON_IMAP(
}
dc_msg_unref(msg);
}
unsafe extern "C" fn dc_send_mdn(mut context: *mut dc_context_t, mut msg_id: uint32_t) {
unsafe fn dc_send_mdn(mut context: *mut dc_context_t, mut msg_id: uint32_t) {
let mut mimefactory: dc_mimefactory_t = dc_mimefactory_t {
from_addr: 0 as *mut libc::c_char,
from_displayname: 0 as *mut libc::c_char,
@@ -790,7 +782,7 @@ unsafe extern "C" fn dc_send_mdn(mut context: *mut dc_context_t, mut msg_id: uin
* @param mimefactory An instance of dc_mimefactory_t with a loaded and rendered message or MDN
* @return 1=success, 0=error
*/
unsafe extern "C" fn dc_add_smtp_job(
unsafe fn dc_add_smtp_job(
mut context: *mut dc_context_t,
mut action: libc::c_int,
mut mimefactory: *mut dc_mimefactory_t,
@@ -854,8 +846,7 @@ unsafe extern "C" fn dc_add_smtp_job(
free(pathNfilename as *mut libc::c_void);
return success;
}
#[no_mangle]
pub unsafe extern "C" fn dc_job_add(
pub unsafe fn dc_job_add(
mut context: *mut dc_context_t,
mut action: libc::c_int,
mut foreign_id: libc::c_int,
@@ -904,8 +895,7 @@ pub unsafe extern "C" fn dc_job_add(
dc_interrupt_smtp_idle(context);
};
}
#[no_mangle]
pub unsafe extern "C" fn dc_interrupt_smtp_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_interrupt_smtp_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
dc_log_warning(
context,
@@ -925,8 +915,7 @@ pub unsafe extern "C" fn dc_interrupt_smtp_idle(mut context: *mut dc_context_t)
pthread_cond_signal(&mut (*context).smtpidle_cond);
pthread_mutex_unlock(&mut (*context).smtpidle_condmutex);
}
#[no_mangle]
pub unsafe extern "C" fn dc_interrupt_imap_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_interrupt_imap_idle(mut context: *mut dc_context_t) {
if context.is_null()
|| (*context).magic != 0x11a11807i32 as libc::c_uint
|| (*context).inbox.is_null()
@@ -948,7 +937,7 @@ pub unsafe extern "C" fn dc_interrupt_imap_idle(mut context: *mut dc_context_t)
pthread_mutex_unlock(&mut (*context).inboxidle_condmutex);
dc_imap_interrupt_idle((*context).inbox);
}
unsafe extern "C" fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(
unsafe fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(
mut context: *mut dc_context_t,
mut job: *mut dc_job_t,
) {
@@ -1011,11 +1000,7 @@ unsafe extern "C" fn dc_job_do_DC_JOB_DELETE_MSG_ON_IMAP(
dc_msg_unref(msg);
}
/* delete all pending jobs with the given action */
#[no_mangle]
pub unsafe extern "C" fn dc_job_kill_action(
mut context: *mut dc_context_t,
mut action: libc::c_int,
) {
pub unsafe fn dc_job_kill_action(mut context: *mut dc_context_t, mut action: libc::c_int) {
if context.is_null() {
return;
}
@@ -1027,8 +1012,7 @@ pub unsafe extern "C" fn dc_job_kill_action(
sqlite3_step(stmt);
sqlite3_finalize(stmt);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_imap_fetch(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_imap_fetch(mut context: *mut dc_context_t) {
let mut start: libc::clock_t = clock();
if 0 == connect_to_inbox(context) {
return;
@@ -1067,8 +1051,7 @@ pub unsafe extern "C" fn dc_perform_imap_fetch(mut context: *mut dc_context_t) {
clock().wrapping_sub(start) as libc::c_double * 1000.0f64 / 1000000i32 as libc::c_double,
);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_imap_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_imap_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
return;
}
@@ -1097,8 +1080,7 @@ pub unsafe extern "C" fn dc_perform_imap_idle(mut context: *mut dc_context_t) {
b"INBOX-IDLE ended.\x00" as *const u8 as *const libc::c_char,
);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_mvbox_fetch(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_mvbox_fetch(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
return;
}
@@ -1109,8 +1091,7 @@ pub unsafe extern "C" fn dc_perform_mvbox_fetch(mut context: *mut dc_context_t)
);
dc_jobthread_fetch(&mut (*context).mvbox_thread, use_network);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_mvbox_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_mvbox_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
return;
}
@@ -1121,8 +1102,7 @@ pub unsafe extern "C" fn dc_perform_mvbox_idle(mut context: *mut dc_context_t) {
);
dc_jobthread_idle(&mut (*context).mvbox_thread, use_network);
}
#[no_mangle]
pub unsafe extern "C" fn dc_interrupt_mvbox_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_interrupt_mvbox_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
dc_log_warning(
context,
@@ -1133,8 +1113,7 @@ pub unsafe extern "C" fn dc_interrupt_mvbox_idle(mut context: *mut dc_context_t)
}
dc_jobthread_interrupt_idle(&mut (*context).mvbox_thread);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_sentbox_fetch(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_sentbox_fetch(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
return;
}
@@ -1145,8 +1124,7 @@ pub unsafe extern "C" fn dc_perform_sentbox_fetch(mut context: *mut dc_context_t
);
dc_jobthread_fetch(&mut (*context).sentbox_thread, use_network);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_sentbox_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_sentbox_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
return;
}
@@ -1157,8 +1135,7 @@ pub unsafe extern "C" fn dc_perform_sentbox_idle(mut context: *mut dc_context_t)
);
dc_jobthread_idle(&mut (*context).sentbox_thread, use_network);
}
#[no_mangle]
pub unsafe extern "C" fn dc_interrupt_sentbox_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_interrupt_sentbox_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
dc_log_warning(
context,
@@ -1169,8 +1146,7 @@ pub unsafe extern "C" fn dc_interrupt_sentbox_idle(mut context: *mut dc_context_
}
dc_jobthread_interrupt_idle(&mut (*context).sentbox_thread);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_smtp_jobs(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_smtp_jobs(mut context: *mut dc_context_t) {
pthread_mutex_lock(&mut (*context).smtpidle_condmutex);
let mut probe_smtp_network: libc::c_int = (*context).probe_smtp_network;
(*context).probe_smtp_network = 0i32;
@@ -1201,8 +1177,7 @@ pub unsafe extern "C" fn dc_perform_smtp_jobs(mut context: *mut dc_context_t) {
(*context).smtp_doing_jobs = 0i32;
pthread_mutex_unlock(&mut (*context).smtpidle_condmutex);
}
#[no_mangle]
pub unsafe extern "C" fn dc_perform_smtp_idle(mut context: *mut dc_context_t) {
pub unsafe fn dc_perform_smtp_idle(mut context: *mut dc_context_t) {
if context.is_null() || (*context).magic != 0x11a11807i32 as libc::c_uint {
dc_log_warning(
context,
@@ -1252,10 +1227,7 @@ pub unsafe extern "C" fn dc_perform_smtp_idle(mut context: *mut dc_context_t) {
b"SMTP-idle ended.\x00" as *const u8 as *const libc::c_char,
);
}
unsafe extern "C" fn get_next_wakeup_time(
mut context: *mut dc_context_t,
mut thread: libc::c_int,
) -> time_t {
unsafe fn get_next_wakeup_time(mut context: *mut dc_context_t, mut thread: libc::c_int) -> time_t {
let mut wakeup_time: time_t = 0i32 as time_t;
let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt;
stmt = dc_sqlite3_prepare(
@@ -1273,8 +1245,7 @@ unsafe extern "C" fn get_next_wakeup_time(
sqlite3_finalize(stmt);
return wakeup_time;
}
#[no_mangle]
pub unsafe extern "C" fn dc_maybe_network(mut context: *mut dc_context_t) {
pub unsafe fn dc_maybe_network(mut context: *mut dc_context_t) {
pthread_mutex_lock(&mut (*context).smtpidle_condmutex);
(*context).probe_smtp_network = 1i32;
pthread_mutex_unlock(&mut (*context).smtpidle_condmutex);
@@ -1286,8 +1257,7 @@ pub unsafe extern "C" fn dc_maybe_network(mut context: *mut dc_context_t) {
dc_interrupt_mvbox_idle(context);
dc_interrupt_sentbox_idle(context);
}
#[no_mangle]
pub unsafe extern "C" fn dc_job_action_exists(
pub unsafe fn dc_job_action_exists(
mut context: *mut dc_context_t,
mut action: libc::c_int,
) -> libc::c_int {
@@ -1303,11 +1273,7 @@ pub unsafe extern "C" fn dc_job_action_exists(
return job_exists;
}
/* special case for DC_JOB_SEND_MSG_TO_SMTP */
#[no_mangle]
pub unsafe extern "C" fn dc_job_send_msg(
mut context: *mut dc_context_t,
mut msg_id: uint32_t,
) -> libc::c_int {
pub unsafe fn dc_job_send_msg(mut context: *mut dc_context_t, mut msg_id: uint32_t) -> libc::c_int {
let mut success: libc::c_int = 0i32;
let mut mimefactory: dc_mimefactory_t = dc_mimefactory_t {
from_addr: 0 as *mut libc::c_char,