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

Rename dc_mimefactory_t -> MimeFactory

Browse Source 
CamelCase naming convention is more natural for Rust.

https://rust-lang-nursery.github.io/api-guidelines/naming.html
This commit is contained in:
Dmitry Bogatov
2019-09-14 12:44:37 +00:00
parent 5001a0e37d
commit 34a3ad82e0
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/dc_mimefactory.rs
View File

@@ -28,8 +28,7 @@ use crate::stock::StockMessage;
use crate::x::*; use crate::x::*;
#[derive(Clone)] #[derive(Clone)]
#[allow(non_camel_case_types)] pub struct MimeFactory<'a> {
pub struct dc_mimefactory_t<'a> {
pub from_addr: *mut libc::c_char, pub from_addr: *mut libc::c_char,
pub from_displayname: *mut libc::c_char, pub from_displayname: *mut libc::c_char,
pub selfstatus: Option<String>, pub selfstatus: Option<String>,
@@ -52,7 +51,7 @@ pub struct dc_mimefactory_t<'a> {
pub context: &'a Context, pub context: &'a Context,
} }
impl<'a> Drop for dc_mimefactory_t<'a> { impl<'a> Drop for MimeFactory<'a> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
free(self.from_addr as *mut libc::c_void); free(self.from_addr as *mut libc::c_void);
@@ -85,12 +84,12 @@ pub const DC_MF_NOTHING_LOADED: dc_mimefactory_loaded_t = 0;
pub unsafe fn dc_mimefactory_load_msg( pub unsafe fn dc_mimefactory_load_msg(
context: &Context, context: &Context,
msg_id: u32, msg_id: u32,
) -> Result<dc_mimefactory_t, Error> { ) -> Result<MimeFactory, Error> {
ensure!(msg_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id"); ensure!(msg_id > DC_CHAT_ID_LAST_SPECIAL, "Invalid chat id");
let msg = dc_msg_load_from_db(context, msg_id)?; let msg = dc_msg_load_from_db(context, msg_id)?;
let chat = Chat::load_from_db(context, msg.chat_id)?; let chat = Chat::load_from_db(context, msg.chat_id)?;
let mut factory = dc_mimefactory_t { let mut factory = MimeFactory {
from_addr: ptr::null_mut(), from_addr: ptr::null_mut(),
from_displayname: ptr::null_mut(), from_displayname: ptr::null_mut(),
selfstatus: None, selfstatus: None,
@@ -237,7 +236,7 @@ pub unsafe fn dc_mimefactory_load_msg(
Ok(factory) Ok(factory)
} }
unsafe fn load_from(factory: &mut dc_mimefactory_t) { unsafe fn load_from(factory: &mut MimeFactory) {
let context = factory.context; let context = factory.context;
factory.from_addr = context factory.from_addr = context
.sql .sql
@@ -266,7 +265,7 @@ unsafe fn load_from(factory: &mut dc_mimefactory_t) {
pub unsafe fn dc_mimefactory_load_mdn<'a>( pub unsafe fn dc_mimefactory_load_mdn<'a>(
context: &'a Context, context: &'a Context,
msg_id: u32, msg_id: u32,
) -> Result<dc_mimefactory_t, Error> { ) -> Result<MimeFactory, Error> {
if 0 == context if 0 == context
.sql .sql
.get_config_int(context, "mdns_enabled") .get_config_int(context, "mdns_enabled")
@@ -280,7 +279,7 @@ pub unsafe fn dc_mimefactory_load_mdn<'a>(
let msg = dc_msg_load_from_db(context, msg_id)?; let msg = dc_msg_load_from_db(context, msg_id)?;
let mut factory = dc_mimefactory_t { let mut factory = MimeFactory {
from_addr: ptr::null_mut(), from_addr: ptr::null_mut(),
from_displayname: ptr::null_mut(), from_displayname: ptr::null_mut(),
selfstatus: None, selfstatus: None,
@@ -335,7 +334,7 @@ pub unsafe fn dc_mimefactory_load_mdn<'a>(
Ok(factory) Ok(factory)
} }
pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut dc_mimefactory_t) -> bool { pub unsafe fn dc_mimefactory_render(context: &Context, factory: &mut MimeFactory) -> bool {
let subject: *mut mailimf_subject; let subject: *mut mailimf_subject;
let mut ok_to_continue = true; let mut ok_to_continue = true;
let imf_fields: *mut mailimf_fields; let imf_fields: *mut mailimf_fields;
@@ -1074,7 +1073,7 @@ unsafe fn get_subject(
ret ret
} }
unsafe fn set_error(factory: *mut dc_mimefactory_t, text: *const libc::c_char) { unsafe fn set_error(factory: *mut MimeFactory, text: *const libc::c_char) {
if factory.is_null() { if factory.is_null() {
return; return;
} }

2
src/job.rs
View File

@@ -1003,7 +1003,7 @@ fn send_mdn(context: &Context, msg_id: u32) {
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn add_smtp_job(context: &Context, action: Action, mimefactory: &dc_mimefactory_t) -> libc::c_int { fn add_smtp_job(context: &Context, action: Action, mimefactory: &MimeFactory) -> libc::c_int {
let mut success: libc::c_int = 0i32; let mut success: libc::c_int = 0i32;
let mut recipients: *mut libc::c_char = ptr::null_mut(); let mut recipients: *mut libc::c_char = ptr::null_mut();
let mut param = Params::new(); let mut param = Params::new();