Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from flub/as_str

Browse Source 
Rename to_str() -> as_str() to match stdlib naming convention
This commit is contained in:
Floris Bruynooghe
2019-06-08 10:57:24 +02:00
committed by GitHub
parent a32a275d73 855c7844b5
commit 0bce754adf
19 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/context.rs
View File

@@ -754,8 +754,8 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
public_key_count={}\n\
fingerprint={}\n\
level=awesome\n",
to_str(DC_VERSION_STR as *const u8 as *const _),
to_str(libsqlite3_sys::SQLITE_VERSION as *const u8 as *const libc::c_char),
as_str(DC_VERSION_STR as *const u8 as *const _),
as_str(libsqlite3_sys::SQLITE_VERSION as *const u8 as *const libc::c_char),
sqlite3_threadsafe(),
// arch
(::std::mem::size_of::<*mut libc::c_void>()).wrapping_mul(8),
@@ -764,31 +764,31 @@ pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {
deaddrop_msgs,
contacts,
if context.has_dbfile() {
to_str(context.get_dbfile())
as_str(context.get_dbfile())
} else {
unset
},
dbversion,
if context.has_blobdir() {
to_str(context.get_blobdir())
as_str(context.get_blobdir())
} else {
unset
},
if !displayname.is_null() {
to_str(displayname)
as_str(displayname)
} else {
unset
},
is_configured,
to_str(l_readable_str),
to_str(l2_readable_str),
as_str(l_readable_str),
as_str(l2_readable_str),
inbox_watch,
sentbox_watch,
mvbox_watch,
mvbox_move,
folders_configured,
to_str(configured_sentbox_folder),
to_str(configured_mvbox_folder),
as_str(configured_sentbox_folder),
as_str(configured_mvbox_folder),
mdns_enabled,
e2ee_enabled,
prv_key_cnt,

2
src/dc_array.rs
View File

@@ -360,7 +360,7 @@ pub unsafe fn dc_array_get_string(
}
let cnt = (*array).count as usize;
let slice = std::slice::from_raw_parts((*array).array, cnt);
let sep = to_str(sep);
let sep = as_str(sep);
let res = slice
.iter()

8
src/dc_configure.rs
View File

@@ -207,8 +207,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
);
let oauth2_addr = dc_get_oauth2_addr(
context,
to_str((*param).addr),
to_str((*param).mail_pw),
as_str((*param).addr),
as_str((*param).mail_pw),
);
if oauth2_addr.is_some() {
free((*param).addr as *mut libc::c_void);
@@ -1432,7 +1432,7 @@ unsafe fn moz_autoconfigure_text_cb(
(*(*moz_ac).out).send_server = val;
val = 0 as *mut libc::c_char
}
11 => (*(*moz_ac).out).send_port = to_str(val).parse().unwrap_or_default(),
11 => (*(*moz_ac).out).send_port = as_str(val).parse().unwrap_or_default(),
12 => {
free((*(*moz_ac).out).send_user as *mut libc::c_void);
(*(*moz_ac).out).send_user = val;
@@ -1526,7 +1526,7 @@ fn read_autoconf_file(context: &Context, url: *const libc::c_char) -> *mut libc:
info!(context, 0, "Testing {} ...", to_string(url));
match reqwest::Client::new()
.get(to_str(url))
.get(as_str(url))
.send()
.and_then(|mut res| res.text())
{

6
src/dc_contact.rs
View File

@@ -779,7 +779,7 @@ pub unsafe fn dc_get_contact_encrinfo(
let peerstate = Peerstate::from_addr(
context,
&context.sql.clone().read().unwrap(),
to_str((*contact).addr),
as_str((*contact).addr),
);
dc_loginparam_read(
context,
@@ -831,7 +831,7 @@ pub unsafe fn dc_get_contact_encrinfo(
.map(|k| k.formatted_fingerprint_c())
.unwrap_or(std::ptr::null_mut());
if peerstate.addr.is_some()
&& to_str((*loginparam).addr) < peerstate.addr.as_ref().unwrap().as_str()
&& as_str((*loginparam).addr) < peerstate.addr.as_ref().unwrap().as_str()
{
cat_fingerprint(
&mut ret,
@@ -1121,7 +1121,7 @@ pub unsafe fn dc_contact_is_verified_ex<'a>(
let peerstate = Peerstate::from_addr(
(*contact).context,
&(*contact).context.sql.clone().read().unwrap(),
to_str((*contact).addr),
as_str((*contact).addr),
);
let res = if let Some(ps) = peerstate {

6
src/dc_e2ee.rs
View File

@@ -121,7 +121,7 @@ pub unsafe fn dc_e2ee_encrypt(
let peerstate = Peerstate::from_addr(
context,
&context.sql.clone().read().unwrap(),
to_str(recipient_addr),
as_str(recipient_addr),
);
if peerstate.is_some()
&& (peerstate.as_ref().unwrap().prefer_encrypt
@@ -613,7 +613,7 @@ pub unsafe fn dc_e2ee_decrypt(
let autocryptheader = Aheader::from_imffields(from, imffields);
if message_time > 0 && !from.is_null() {
peerstate =
Peerstate::from_addr(context, &context.sql.clone().read().unwrap(), to_str(from));
Peerstate::from_addr(context, &context.sql.clone().read().unwrap(), as_str(from));
if let Some(ref mut peerstate) = peerstate {
if let Some(ref header) = autocryptheader {
@@ -648,7 +648,7 @@ pub unsafe fn dc_e2ee_decrypt(
peerstate = Peerstate::from_addr(
&context,
&context.sql.clone().read().unwrap(),
to_str(from),
as_str(from),
);
}
if let Some(ref peerstate) = peerstate {

6
src/dc_imex.rs
View File

@@ -52,7 +52,7 @@ pub unsafe fn dc_imex_has_backup(
let mut curr_pathNfilename: *mut libc::c_char = 0 as *mut libc::c_char;
let mut test_sql: Option<dc_sqlite3_t> = None;
let dir = std::path::Path::new(to_str(dir_name));
let dir = std::path::Path::new(as_str(dir_name));
if dir.is_dir() {
match std::fs::read_dir(dir) {
@@ -1174,7 +1174,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
11487273724841241105 => {}
_ => {
let mut total_files_cnt = 0;
let dir = std::path::Path::new(to_str(context.get_blobdir()));
let dir = std::path::Path::new(as_str(context.get_blobdir()));
let dir_handle = std::fs::read_dir(dir);
if dir_handle.is_err() {
dc_log_error(
@@ -1378,7 +1378,7 @@ unsafe fn import_self_keys(context: &Context, dir_name: *const libc::c_char) ->
// a pointer inside buf2, MUST NOT be free()'d
let mut buf2_headerline: *const libc::c_char = 0 as *const libc::c_char;
if !dir_name.is_null() {
let dir = std::path::Path::new(to_str(dir_name));
let dir = std::path::Path::new(as_str(dir_name));
let dir_handle = std::fs::read_dir(dir);
if dir_handle.is_err() {
dc_log_error(

6
src/dc_job.rs
View File

@@ -486,13 +486,13 @@ unsafe fn dc_job_do_DC_JOB_MOVE_MSG(context: &Context, job: &mut dc_job_t) {
);
if !dest_folder.is_null() {
let server_folder = to_str((*msg).server_folder);
let server_folder = as_str((*msg).server_folder);
match inbox.mv(
context,
server_folder,
(*msg).server_uid,
to_str(dest_folder),
as_str(dest_folder),
&mut dest_uid,
) as libc::c_uint
{
@@ -593,7 +593,7 @@ unsafe fn dc_job_do_DC_JOB_MARKSEEN_MDN_ON_IMAP(context: &Context, job: &mut dc_
0 as *const libc::c_char,
);
if !dest_folder.is_null() {
let dest_folder = to_str(dest_folder);
let dest_folder = as_str(dest_folder);
if 1 == inbox.mv(context, folder, uid, dest_folder, &mut dest_uid)
as libc::c_uint
{

2
src/dc_location.rs
View File

@@ -620,7 +620,7 @@ unsafe fn kml_text_cb(userdata: *mut libc::c_void, text: *const libc::c_char, _l
if 0 != (*kml).tag & 0x4 && strlen(val) >= 19 {
// YYYY-MM-DDTHH:MM:SSZ
// 0 4 7 10 13 16 19
let val_r = to_str(val);
let val_r = as_str(val);
match chrono::NaiveDateTime::parse_from_str(val_r, "%Y-%m-%dT%H:%M:%SZ") {
Ok(res) => {
(*kml).curr.timestamp = res.timestamp();

8
src/dc_mimeparser.rs
View File

@@ -495,7 +495,7 @@ pub fn dc_mimeparser_lookup_field(
) -> *mut mailimf_field {
mimeparser
.header
.get(to_str(field_name))
.get(as_str(field_name))
.map(|v| *v)
.unwrap_or_else(|| std::ptr::null_mut())
}
@@ -506,7 +506,7 @@ pub unsafe fn dc_mimeparser_lookup_optional_field(
) -> *mut mailimf_optional_field {
let field = mimeparser
.header
.get(to_str(field_name))
.get(as_str(field_name))
.map(|v| *v)
.unwrap_or_else(|| std::ptr::null_mut());
if !field.is_null() && (*field).fld_type == MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int {
@@ -861,7 +861,7 @@ unsafe fn hash_header(
}
if !key.is_null() {
let key_len: libc::c_int = strlen(key) as libc::c_int;
if out.contains_key(to_str(key)) {
if out.contains_key(as_str(key)) {
if (*field).fld_type != MAILIMF_FIELD_OPTIONAL_FIELD as libc::c_int
|| key_len > 5i32
&& strncasecmp(key, b"Chat-\x00" as *const u8 as *const libc::c_char, 5)
@@ -1691,7 +1691,7 @@ pub unsafe fn dc_mimeparser_sender_equals_recipient(mimeparser: &dc_mimeparser_t
from_addr_norm = dc_addr_normalize((*mb).mb_addr_spec);
let recipients = mailimf_get_recipients(mimeparser.header_root);
if recipients.len() == 1 {
if recipients.contains(to_str(from_addr_norm)) {
if recipients.contains(as_str(from_addr_norm)) {
sender_equals_recipient = 1i32;
}
}

2
src/dc_param.rs
View File

@@ -164,7 +164,7 @@ pub unsafe fn dc_param_get_int(
if str.is_null() {
return def;
}
let ret: int32_t = to_str(str).parse().unwrap_or_default();
let ret: int32_t = as_str(str).parse().unwrap_or_default();
free(str as *mut libc::c_void);
ret

2
src/dc_qr.rs
View File

@@ -240,7 +240,7 @@ pub unsafe fn dc_check_qr(context: &Context, qr: *const libc::c_char) -> *mut dc
let peerstate = Peerstate::from_fingerprint(
context,
&context.sql.clone().read().unwrap(),
to_str(fingerprint),
as_str(fingerprint),
);
if addr.is_null() || invitenumber.is_null() || auth.is_null() {
if let Some(peerstate) = peerstate {

6
src/dc_receive_imf.rs
View File

@@ -1860,7 +1860,7 @@ unsafe fn check_verified_properties(
let peerstate = Peerstate::from_addr(
context,
&context.sql.clone().read().unwrap(),
to_str((*contact).addr),
as_str((*contact).addr),
);
if peerstate.is_none() || dc_contact_is_verified_ex(contact, peerstate.as_ref()) != 2 {
@@ -1909,12 +1909,12 @@ unsafe fn check_verified_properties(
let mut peerstate = Peerstate::from_addr(
context,
&context.sql.clone().read().unwrap(),
to_str(to_addr),
as_str(to_addr),
);
if mimeparser
.e2ee_helper
.gossipped_addr
.contains(to_str(to_addr))
.contains(as_str(to_addr))
&& peerstate.is_some()
{
let peerstate = peerstate.as_mut().unwrap();

10
src/dc_securejoin.rs
View File

@@ -372,9 +372,9 @@ unsafe fn fingerprint_equals_sender(
if let Some(peerstate) = Peerstate::from_addr(
context,
&context.sql.clone().read().unwrap(),
to_str((*contact).addr),
as_str((*contact).addr),
) {
let fingerprint_normalized = dc_normalize_fingerprint(to_str(fingerprint));
let fingerprint_normalized = dc_normalize_fingerprint(as_str(fingerprint));
if peerstate.public_key_fingerprint.is_some()
&& &fingerprint_normalized == peerstate.public_key_fingerprint.as_ref().unwrap()
{
@@ -998,9 +998,9 @@ unsafe fn mark_peer_as_verified(
if let Some(ref mut peerstate) = Peerstate::from_fingerprint(
context,
&context.sql.clone().read().unwrap(),
to_str(fingerprint),
as_str(fingerprint),
) {
if peerstate.set_verified(1, to_str(fingerprint), 2) {
if peerstate.set_verified(1, as_str(fingerprint), 2) {
peerstate.prefer_encrypt = EncryptPreference::Mutual;
peerstate.to_save = Some(ToSave::All);
peerstate.save_to_db(&context.sql.clone().read().unwrap(), false);
@@ -1047,7 +1047,7 @@ unsafe fn encrypted_and_signed(
if !mimeparser
.e2ee_helper
.signatures
.contains(to_str(expected_fingerprint))
.contains(as_str(expected_fingerprint))
{
dc_log_warning(
mimeparser.context,

8
src/dc_sqlite3.rs
View File

@@ -863,7 +863,7 @@ pub unsafe fn dc_sqlite3_open(
if let Some(ref mut peerstate) = Peerstate::from_addr(
context,
sql,
to_str(sqlite3_column_text(stmt, 0) as *const libc::c_char),
as_str(sqlite3_column_text(stmt, 0) as *const libc::c_char),
) {
peerstate.recalc_fingerprint();
peerstate.save_to_db(sql, false);
@@ -1239,7 +1239,7 @@ pub fn dc_sqlite3_get_config_int64(
return def;
}
let ret: i64 = to_str(s).parse().unwrap_or_default();
let ret: i64 = as_str(s).parse().unwrap_or_default();
unsafe { free(s as *mut libc::c_void) };
ret
}
@@ -1381,7 +1381,7 @@ pub unsafe fn dc_housekeeping(context: &Context) {
files_in_use.len() as libc::c_int,
);
/* go through directory and delete unused files */
let p = std::path::Path::new(to_str(context.get_blobdir()));
let p = std::path::Path::new(as_str(context.get_blobdir()));
let dir_handle = std::fs::read_dir(p);
if dir_handle.is_err() {
dc_log_warning(
@@ -1493,7 +1493,7 @@ unsafe fn is_file_in_use(
*name_to_check.offset((name_len - namespc_len) as isize) = 0 as libc::c_char
}
let contains = files_in_use.contains(to_str(name_to_check));
let contains = files_in_use.contains(as_str(name_to_check));
free(name_to_check as *mut libc::c_void);
contains
}

8
src/dc_tools.rs
View File

@@ -47,7 +47,7 @@ pub unsafe fn dc_strdup_keep_null(s: *const libc::c_char) -> *mut libc::c_char {
pub unsafe fn dc_atoi_null_is_0(s: *const libc::c_char) -> libc::c_int {
if !s.is_null() {
to_str(s).parse().unwrap_or_default()
as_str(s).parse().unwrap_or_default()
} else {
0
}
@@ -58,7 +58,7 @@ pub fn dc_atof(s: *const libc::c_char) -> libc::c_double {
return 0.;
}
to_str(s).parse().unwrap_or_default()
as_str(s).parse().unwrap_or_default()
}
pub unsafe fn dc_str_replace(
@@ -1235,7 +1235,7 @@ pub unsafe fn dc_create_folder(
let mut success = 0;
let pathNfilename_abs = dc_get_abs_path(context, pathNfilename);
{
let p = std::path::Path::new(to_str(pathNfilename_abs));
let p = std::path::Path::new(as_str(pathNfilename_abs));
if !p.exists() {
match fs::create_dir_all(p) {
Ok(_) => {
@@ -1566,7 +1566,7 @@ pub fn to_string(s: *const libc::c_char) -> String {
unsafe { std::ffi::CStr::from_ptr(s).to_str().unwrap().to_string() }
}
pub fn to_str<'a>(s: *const libc::c_char) -> &'a str {
pub fn as_str<'a>(s: *const libc::c_char) -> &'a str {
assert!(!s.is_null(), "cannot be used on null pointers");
unsafe { std::ffi::CStr::from_ptr(s).to_str().unwrap() }
}

12
src/imap.rs
View File

@@ -7,7 +7,7 @@ use crate::constants::*;
use crate::context::Context;
use crate::dc_loginparam::*;
use crate::dc_sqlite3::*;
use crate::dc_tools::{to_str, to_string};
use crate::dc_tools::{as_str, to_string};
use crate::oauth2::dc_get_oauth2_access_token;
use crate::types::*;
@@ -521,11 +521,11 @@ impl Imap {
}
{
let addr = to_str(lp.addr);
let imap_server = to_str(lp.mail_server);
let addr = as_str(lp.addr);
let imap_server = as_str(lp.mail_server);
let imap_port = lp.mail_port as u16;
let imap_user = to_str(lp.mail_user);
let imap_pw = to_str(lp.mail_pw);
let imap_user = as_str(lp.mail_user);
let imap_pw = as_str(lp.mail_pw);
let server_flags = lp.server_flags as usize;
let mut config = self.config.write().unwrap();
@@ -695,7 +695,7 @@ impl Imap {
if val1.is_null() {
return (0, 0);
}
let entry = to_str(val1);
let entry = as_str(val1);
// the entry has the format `imap.mailbox.<folder>=<uidvalidity>:<lastseenuid>`
let mut parts = entry.split(':');

6
src/smtp.rs
View File

@@ -106,13 +106,13 @@ impl Smtp {
let creds = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {
// oauth2
let addr = to_str(lp.addr);
let send_pw = to_str(lp.send_pw);
let addr = as_str(lp.addr);
let send_pw = as_str(lp.send_pw);
let access_token = dc_get_oauth2_access_token(context, addr, send_pw, 0);
if access_token.is_none() {
return 0;
}
let user = to_str(lp.send_user);
let user = as_str(lp.send_user);
lettre::smtp::authentication::Credentials::new(user.into(), access_token.unwrap())
} else {