From d3e521ded02353399d5ad49fa469be37f0250510 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sat, 6 Jul 2019 13:49:24 +0200 Subject: [PATCH] rebase fixes --- src/dc_imex.rs | 13 ++++--------- src/key.rs | 3 +-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/dc_imex.rs b/src/dc_imex.rs index d27f397f7..a593c9032 100644 --- a/src/dc_imex.rs +++ b/src/dc_imex.rs @@ -389,11 +389,6 @@ fn set_self_key( armored_c: *const libc::c_char, set_default: libc::c_int, ) -> libc::c_int { - let mut success = 0; - - let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt; - let mut self_addr: *mut libc::c_char = 0 as *mut libc::c_char; - assert!(!armored_c.is_null(), "invalid buffer"); let armored = as_str(armored_c); @@ -450,10 +445,10 @@ fn set_self_key( return 0; } - match preferencrypt.as_str() { - "" => 0, - "nopreference" => dc_sqlite3_set_config_int(context, &context.sql, "e2ee_enabled", 0), - "mutual" => dc_sqlite3_set_config_int(context, &context.sql, "e2ee_enabled", 1), + match preferencrypt.map(|s| s.as_str()) { + Some("") => 0, + Some("nopreference") => dc_sqlite3_set_config_int(context, &context.sql, "e2ee_enabled", 0), + Some("mutual") => dc_sqlite3_set_config_int(context, &context.sql, "e2ee_enabled", 1), _ => 1, } } diff --git a/src/key.rs b/src/key.rs index 20b76c79c..a10b0be67 100644 --- a/src/key.rs +++ b/src/key.rs @@ -458,8 +458,7 @@ i8pcjGO+IZffvyZJVRWfVooBJmWWbPB1pueo3tx8w3+fcuzpxz+RLFKaPyqXO+dD #[test] #[ignore] // is too expensive fn test_ascii_roundtrip() { - let (public_key, private_key) = - crate::pgp::dc_pgp_create_keypair(CString::new("hello").unwrap().as_ptr()).unwrap(); + let (public_key, private_key) = crate::pgp::dc_pgp_create_keypair("hello").unwrap(); let s = public_key.to_armored_string(None).unwrap(); let (public_key2, _) =