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

Also silence warnings in test code

Browse Source 
We can be a bit more liberal with .unwrap() here.
This commit is contained in:
Floris Bruynooghe
2019-07-21 12:03:04 +02:00
parent 31d2bc7401
commit 68888f6d1f
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
examples/repl/cmdline.rs
View File

@@ -28,7 +28,7 @@ use num_traits::FromPrimitive;
pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 { pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
info!(context, 0, "Resetting tables ({})...", bits); info!(context, 0, "Resetting tables ({})...", bits);
if 0 != bits & 1 { if 0 != bits & 1 {
sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]); sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
info!(context, 0, "(1) Jobs reset."); info!(context, 0, "(1) Jobs reset.");
} }
if 0 != bits & 2 { if 0 != bits & 2 {
@@ -37,11 +37,12 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
&context.sql, &context.sql,
"DELETE FROM acpeerstates;", "DELETE FROM acpeerstates;",
params![], params![],
); )
.unwrap();
info!(context, 0, "(2) Peerstates reset."); info!(context, 0, "(2) Peerstates reset.");
} }
if 0 != bits & 4 { if 0 != bits & 4 {
sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]); sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
info!(context, 0, "(4) Private keypairs reset."); info!(context, 0, "(4) Private keypairs reset.");
} }
if 0 != bits & 8 { if 0 != bits & 8 {
@@ -50,32 +51,37 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
&context.sql, &context.sql,
"DELETE FROM contacts WHERE id>9;", "DELETE FROM contacts WHERE id>9;",
params![], params![],
); )
.unwrap();
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"DELETE FROM chats WHERE id>9;", "DELETE FROM chats WHERE id>9;",
params![], params![],
); )
.unwrap();
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"DELETE FROM chats_contacts;", "DELETE FROM chats_contacts;",
params![], params![],
); )
.unwrap();
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"DELETE FROM msgs WHERE id>9;", "DELETE FROM msgs WHERE id>9;",
params![], params![],
); )
.unwrap();
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';", "DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';",
params![], params![],
); )
sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]); .unwrap();
sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
info!(context, 0, "(8) Rest but server config reset."); info!(context, 0, "(8) Rest but server config reset.");
} }
@@ -129,7 +135,8 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
real_spec = dc_strdup(spec); real_spec = dc_strdup(spec);
context context
.sql .sql
.set_config(context, "import_spec", Some(as_str(real_spec))); .set_config(context, "import_spec", Some(as_str(real_spec)))
.unwrap();
current_block = 7149356873433890176; current_block = 7149356873433890176;
} else { } else {
let rs = context.sql.get_config(context, "import_spec"); let rs = context.sql.get_config(context, "import_spec");

5
examples/simple.rs
View File

@@ -86,8 +86,9 @@ fn main() {
let args = std::env::args().collect::<Vec<String>>(); let args = std::env::args().collect::<Vec<String>>();
assert_eq!(args.len(), 2, "missing password"); assert_eq!(args.len(), 2, "missing password");
let pw = args[1].clone(); let pw = args[1].clone();
ctx.set_config(config::Config::Addr, Some("d@testrun.org")); ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
ctx.set_config(config::Config::MailPw, Some(&pw)); .unwrap();
ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
dc_configure(&ctx); dc_configure(&ctx);
thread::sleep(duration); thread::sleep(duration);