Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 12:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove usage of printf

Browse Source
This commit is contained in:
dignifiedquire
2019-05-29 19:06:36 +02:00
parent fe30950f33
commit 31daa425cf
2 changed files with 54 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
examples/repl/main.rs
View File

@@ -46,125 +46,94 @@ unsafe extern "C" fn receive_event(
2091 => {} 2091 => {}
100 => { 100 => {
/* do not show the event as this would fill the screen */ /* do not show the event as this would fill the screen */
printf( println!("{}", to_string(data2 as *const _),);
b"%s\n\x00" as *const u8 as *const libc::c_char,
data2 as *mut libc::c_char,
);
} }
101 => { 101 => {
printf( println!("[DC_EVENT_SMTP_CONNECTED] {}", to_string(data2 as *const _));
b"[DC_EVENT_SMTP_CONNECTED] %s\n\x00" as *const u8 as *const libc::c_char,
data2 as *mut libc::c_char,
);
} }
102 => { 102 => {
printf( println!("[DC_EVENT_IMAP_CONNECTED] {}", to_string(data2 as *const _),);
b"[DC_EVENT_IMAP_CONNECTED] %s\n\x00" as *const u8 as *const libc::c_char,
data2 as *mut libc::c_char,
);
} }
103 => { 103 => {
printf( println!(
b"[DC_EVENT_SMTP_MESSAGE_SENT] %s\n\x00" as *const u8 as *const libc::c_char, "[DC_EVENT_SMTP_MESSAGE_SENT] {}",
data2 as *mut libc::c_char, to_string(data2 as *const _),
); );
} }
300 => { 300 => {
printf( println!("[Warning] {}", to_string(data2 as *const _),);
b"[Warning] %s\n\x00" as *const u8 as *const libc::c_char,
data2 as *mut libc::c_char,
);
} }
400 => { 400 => {
printf( println!(
b"\x1b[31m[DC_EVENT_ERROR] %s\x1b[0m\n\x00" as *const u8 as *const libc::c_char, "\x1b[31m[DC_EVENT_ERROR] {}\x1b[0m",
data2 as *mut libc::c_char, to_string(data2 as *const _),
); );
} }
401 => { 401 => {
printf( println!(
b"\x1b[31m[DC_EVENT_ERROR_NETWORK] first=%i, msg=%s\x1b[0m\n\x00" as *const u8 "\x1b[31m[DC_EVENT_ERROR_NETWORK] first={}, msg={}\x1b[0m",
as *const libc::c_char,
data1 as libc::c_int, data1 as libc::c_int,
data2 as *mut libc::c_char, to_string(data2 as *const _),
); );
} }
410 => { 410 => {
printf( println!(
b"\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] %s\x1b[0m\n\x00" as *const u8 "\x1b[31m[DC_EVENT_ERROR_SELF_NOT_IN_GROUP] {}\x1b[0m",
as *const libc::c_char, to_string(data2 as *const _),
data2 as *mut libc::c_char,
); );
} }
2081 => { 2081 => {
printf( print!("\x1b[33m{{Received DC_EVENT_IS_OFFLINE()}}\n\x1b[0m");
b"\x1b[33m{{Received DC_EVENT_IS_OFFLINE()}}\n\x1b[0m\x00" as *const u8
as *const libc::c_char,
);
} }
2000 => { 2000 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_MSGS_CHANGED(%i, %i)}}\n\x1b[0m\x00" as *const u8 "\x1b[33m{{Received DC_EVENT_MSGS_CHANGED({}, {})}}\n\x1b[0m",
as *const libc::c_char, data1 as libc::c_int, data2 as libc::c_int,
data1 as libc::c_int,
data2 as libc::c_int,
); );
} }
2030 => { 2030 => {
printf( print!("\x1b[33m{{Received DC_EVENT_CONTACTS_CHANGED()}}\n\x1b[0m");
b"\x1b[33m{{Received DC_EVENT_CONTACTS_CHANGED()}}\n\x1b[0m\x00" as *const u8
as *const libc::c_char,
);
} }
2035 => { 2035 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact=%i)}}\n\x1b[0m\x00" "\x1b[33m{{Received DC_EVENT_LOCATION_CHANGED(contact={})}}\n\x1b[0m",
as *const u8 as *const libc::c_char,
data1 as libc::c_int, data1 as libc::c_int,
); );
} }
2041 => { 2041 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_CONFIGURE_PROGRESS(%i \xe2\x80\xb0)}}\n\x1b[0m\x00" "\x1b[33m{{Received DC_EVENT_CONFIGURE_PROGRESS({} ‰)}}\n\x1b[0m",
as *const u8 as *const libc::c_char,
data1 as libc::c_int, data1 as libc::c_int,
); );
} }
2051 => { 2051 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_IMEX_PROGRESS(%i \xe2\x80\xb0)}}\n\x1b[0m\x00" "\x1b[33m{{Received DC_EVENT_IMEX_PROGRESS({} ‰)}}\n\x1b[0m",
as *const u8 as *const libc::c_char,
data1 as libc::c_int, data1 as libc::c_int,
); );
} }
2052 => { 2052 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_IMEX_FILE_WRITTEN(%s)}}\n\x1b[0m\x00" as *const u8 "\x1b[33m{{Received DC_EVENT_IMEX_FILE_WRITTEN({})}}\n\x1b[0m",
as *const libc::c_char, to_string(data1 as *const _)
data1 as *mut libc::c_char,
); );
} }
2055 => { 2055 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_FILE_COPIED(%s)}}\n\x1b[0m\x00" as *const u8 "\x1b[33m{{Received DC_EVENT_FILE_COPIED({})}}\n\x1b[0m",
as *const libc::c_char, to_string(data1 as *const _)
data1 as *mut libc::c_char,
); );
} }
2020 => { 2020 => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_CHAT_MODIFIED(%i)}}\n\x1b[0m\x00" as *const u8 "\x1b[33m{{Received DC_EVENT_CHAT_MODIFIED({})}}\n\x1b[0m",
as *const libc::c_char,
data1 as libc::c_int, data1 as libc::c_int,
); );
} }
_ => { _ => {
printf( print!(
b"\x1b[33m{{Received DC_EVENT_%i(%i, %i)}}\n\x1b[0m\x00" as *const u8 "\x1b[33m{{Received DC_EVENT_{}({}, {})}}\n\x1b[0m",
as *const libc::c_char, event as libc::c_int, data1 as libc::c_int, data2 as libc::c_int,
event as libc::c_int,
data1 as libc::c_int,
data2 as libc::c_int,
); );
} }
} }
@@ -279,16 +248,16 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
if argc == 2i32 { if argc == 2i32 {
if 0 == dc_open(&mut context, *argv.offset(1isize), 0 as *const libc::c_char) { if 0 == dc_open(&mut context, *argv.offset(1isize), 0 as *const libc::c_char) {
printf( println!(
b"ERROR: Cannot open %s.\n\x00" as *const u8 as *const libc::c_char, "ERROR: Cannot open {}.",
*argv.offset(1isize), to_string(*argv.offset(1isize) as *const _)
); );
} }
} else if argc != 1i32 { } else if argc != 1i32 {
printf(b"ERROR: Bad arguments\n\x00" as *const u8 as *const libc::c_char); println!("ERROR: Bad arguments");
} }
printf(b"Delta Chat Core is awaiting your commands.\n\x00" as *const u8 as *const libc::c_char); println!("Delta Chat Core is awaiting your commands.");
let mut handles = None; let mut handles = None;
@@ -311,19 +280,13 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
handles = None; handles = None;
} else if strcmp(cmd, b"smtp-jobs\x00" as *const u8 as *const libc::c_char) == 0i32 { } else if strcmp(cmd, b"smtp-jobs\x00" as *const u8 as *const libc::c_char) == 0i32 {
if 0 != run_threads { if 0 != run_threads {
printf( println!("smtp-jobs are already running in a thread.",);
b"smtp-jobs are already running in a thread.\n\x00" as *const u8
as *const libc::c_char,
);
} else { } else {
dc_perform_smtp_jobs(&ctx.read().unwrap()); dc_perform_smtp_jobs(&ctx.read().unwrap());
} }
} else if strcmp(cmd, b"imap-jobs\x00" as *const u8 as *const libc::c_char) == 0i32 { } else if strcmp(cmd, b"imap-jobs\x00" as *const u8 as *const libc::c_char) == 0i32 {
if 0 != run_threads { if 0 != run_threads {
printf( println!("imap-jobs are already running in a thread.");
b"imap-jobs are already running in a thread.\n\x00" as *const u8
as *const libc::c_char,
);
} else { } else {
dc_perform_imap_jobs(&ctx.read().unwrap()); dc_perform_imap_jobs(&ctx.read().unwrap());
} }
@@ -336,7 +299,7 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
b"addr\x00" as *const u8 as *const libc::c_char, b"addr\x00" as *const u8 as *const libc::c_char,
); );
if addr.is_null() || *addr.offset(0isize) as libc::c_int == 0i32 { if addr.is_null() || *addr.offset(0isize) as libc::c_int == 0i32 {
printf(b"oauth2: set addr first.\n\x00" as *const u8 as *const libc::c_char); println!("oauth2: set addr first.");
} else { } else {
let oauth2_url = dc_get_oauth2_url( let oauth2_url = dc_get_oauth2_url(
&ctx.read().unwrap(), &ctx.read().unwrap(),
@@ -344,18 +307,15 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
"chat.delta:/com.b44t.messenger", "chat.delta:/com.b44t.messenger",
); );
if oauth2_url.is_none() { if oauth2_url.is_none() {
printf( println!("OAuth2 not available for {}.", to_string(addr));
b"OAuth2 not available for %s.\n\x00" as *const u8 as *const libc::c_char,
addr,
);
} else { } else {
println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{}", oauth2_url.unwrap()); println!("Open the following url, set mail_pw to the generated token and server_flags to 2:\n{}", oauth2_url.unwrap());
} }
} }
free(addr as *mut libc::c_void); free(addr as *mut libc::c_void);
} else if strcmp(cmd, b"clear\x00" as *const u8 as *const libc::c_char) == 0i32 { } else if strcmp(cmd, b"clear\x00" as *const u8 as *const libc::c_char) == 0i32 {
printf(b"\n\n\n\n\x00" as *const u8 as *const libc::c_char); println!("\n\n\n");
printf(b"\x1b[1;1H\x1b[2J\x00" as *const u8 as *const libc::c_char); print!("\x1b[1;1H\x1b[2J");
} else if strcmp(cmd, b"getqr\x00" as *const u8 as *const libc::c_char) == 0i32 } else if strcmp(cmd, b"getqr\x00" as *const u8 as *const libc::c_char) == 0i32
|| strcmp(cmd, b"getbadqr\x00" as *const u8 as *const libc::c_char) == 0i32 || strcmp(cmd, b"getbadqr\x00" as *const u8 as *const libc::c_char) == 0i32
{ {
@@ -374,7 +334,7 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
i += 1 i += 1
} }
} }
printf(b"%s\n\x00" as *const u8 as *const libc::c_char, qrstr); println!("{}", to_string(qrstr as *const _));
let syscmd: *mut libc::c_char = dc_mprintf( let syscmd: *mut libc::c_char = dc_mprintf(
b"qrencode -t ansiutf8 \"%s\" -o -\x00" as *const u8 as *const libc::c_char, b"qrencode -t ansiutf8 \"%s\" -o -\x00" as *const u8 as *const libc::c_char,
qrstr, qrstr,
@@ -395,10 +355,7 @@ unsafe fn main_0(argc: libc::c_int, argv: *mut *mut libc::c_char) -> libc::c_int
if !(*cmd.offset(0isize) as libc::c_int == 0i32) { if !(*cmd.offset(0isize) as libc::c_int == 0i32) {
let execute_result: *mut libc::c_char = dc_cmdline(&ctx.read().unwrap(), &cmdline); let execute_result: *mut libc::c_char = dc_cmdline(&ctx.read().unwrap(), &cmdline);
if !execute_result.is_null() { if !execute_result.is_null() {
printf( println!("{}", to_string(execute_result as *const _));
b"%s\n\x00" as *const u8 as *const libc::c_char,
execute_result,
);
free(execute_result as *mut libc::c_void); free(execute_result as *mut libc::c_void);
} }
} }

6
src/x.rs
View File

@@ -3,9 +3,9 @@ use crate::types::*;
pub use libc::{ pub use libc::{
atoi, calloc, close, closedir, exit, fclose, fgets, fopen, fread, free, fseek, ftell, fwrite, atoi, calloc, close, closedir, exit, fclose, fgets, fopen, fread, free, fseek, ftell, fwrite,
malloc, memcmp, memcpy, memmove, memset, mkdir, open, opendir, printf, read, readdir, realloc, malloc, memcmp, memcpy, memmove, memset, mkdir, open, opendir, read, readdir, realloc, remove,
remove, strcat, strchr, strcmp, strcpy, strcspn, strlen, strncmp, strncpy, strrchr, strspn, strcat, strchr, strcmp, strcpy, strcspn, strlen, strncmp, strncpy, strrchr, strspn, strstr,
strstr, strtol, system, tolower, write, strtol, system, tolower, write,
}; };
pub unsafe fn strdup(s: *const libc::c_char) -> *mut libc::c_char { pub unsafe fn strdup(s: *const libc::c_char) -> *mut libc::c_char {