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

refactor: remove dc-strbuilder

Browse Source
This commit is contained in:
Friedel Ziegelmayer
2019-06-08 17:13:25 +02:00
committed by GitHub
parent 4e41dbf5ab
commit af8d056206
18 changed files with 394 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/context.rs
View File

@@ -14,7 +14,6 @@ use crate::dc_msg::*;
use crate::dc_receive_imf::*;
use crate::dc_sqlite3::*;
use crate::dc_stock::*;
use crate::dc_strbuilder::*;
use crate::dc_tools::*;
use crate::imap::*;
use crate::key::*;
@@ -571,23 +570,16 @@ unsafe fn get_sys_config_str(key: *const libc::c_char) -> *mut libc::c_char {
}
unsafe fn get_config_keys_str() -> *mut libc::c_char {
let mut ret = dc_strbuilder_t {
buf: std::ptr::null_mut(),
allocated: 0,
free: 0,
eos: std::ptr::null_mut(),
};
dc_strbuilder_init(&mut ret, 0);
let mut ret = String::new();
let mut i = 0;
while i
< (::std::mem::size_of::<[*const libc::c_char; 33]>())
.wrapping_div(::std::mem::size_of::<*mut libc::c_char>())
{
if strlen(ret.buf) > 0 {
dc_strbuilder_cat(&mut ret, b" \x00" as *const u8 as *const libc::c_char);
if !ret.is_empty() {
ret += " ";
}
dc_strbuilder_cat(&mut ret, config_keys[i as usize]);
ret += &to_string(config_keys[i as usize]);
i += 1
}
@@ -596,14 +588,14 @@ unsafe fn get_config_keys_str() -> *mut libc::c_char {
< (::std::mem::size_of::<[*const libc::c_char; 3]>())
.wrapping_div(::std::mem::size_of::<*mut libc::c_char>())
{
if strlen(ret.buf) > 0 {
dc_strbuilder_cat(&mut ret, b" \x00" as *const u8 as *const libc::c_char);
if !ret.is_empty() {
ret += " ";
}
dc_strbuilder_cat(&mut ret, sys_config_keys[i as usize]);
ret += &to_string(sys_config_keys[i as usize]);
i += 1
}
ret.buf
strdup(to_cstring(ret).as_ptr())
}
pub unsafe fn dc_get_info(context: &Context) -> *mut libc::c_char {