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

Silence warnings from ignored Result values

Browse Source 
For a few of the locations where error handling is done correctly this
does the right thing.  For most other places it gracefully ignores any
issues which is what the original code did as well.  Errors are
already logged by the called functions in those cases.
This commit is contained in:
Floris Bruynooghe
2019-07-21 00:32:33 +02:00
parent f58b1d66c2
commit 31d2bc7401
12 changed files with 107 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/context.rs
View File

@@ -260,7 +260,7 @@ unsafe fn cb_set_config(context: &Context, key: *const libc::c_char, value: *con
} else { } else {
Some(as_str(value)) Some(as_str(value))
}; };
context.sql.set_config(context, as_str(key), v); context.sql.set_config(context, as_str(key), v).ok();
} }
/* * /* *

17
src/dc_chat.rs
View File

@@ -291,7 +291,7 @@ pub unsafe fn dc_create_or_lookup_nchat_by_contact_id(
&context.sql, &context.sql,
format!("INSERT INTO chats_contacts (chat_id, contact_id) VALUES({}, {})", chat_id, contact_id), format!("INSERT INTO chats_contacts (chat_id, contact_id) VALUES({}, {})", chat_id, contact_id),
params![], params![],
); ).ok();
} }
} }
@@ -862,13 +862,15 @@ pub unsafe fn dc_is_contact_in_chat(
.unwrap_or_default() as libc::c_int .unwrap_or_default() as libc::c_int
} }
// Should return Result
pub fn dc_unarchive_chat(context: &Context, chat_id: u32) { pub fn dc_unarchive_chat(context: &Context, chat_id: u32) {
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"UPDATE chats SET archived=0 WHERE id=?", "UPDATE chats SET archived=0 WHERE id=?",
params![chat_id as i32], params![chat_id as i32],
); )
.ok();
} }
pub unsafe fn dc_send_msg<'a>( pub unsafe fn dc_send_msg<'a>(
@@ -1658,6 +1660,7 @@ pub fn dc_reset_gossiped_timestamp(context: &Context, chat_id: u32) {
dc_set_gossiped_timestamp(context, chat_id, 0); dc_set_gossiped_timestamp(context, chat_id, 0);
} }
// Should return Result
pub fn dc_set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) { pub fn dc_set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
if 0 != chat_id { if 0 != chat_id {
info!( info!(
@@ -1670,7 +1673,8 @@ pub fn dc_set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64
&context.sql, &context.sql,
"UPDATE chats SET gossiped_timestamp=? WHERE id=?;", "UPDATE chats SET gossiped_timestamp=? WHERE id=?;",
params![timestamp, chat_id as i32], params![timestamp, chat_id as i32],
); )
.ok();
} else { } else {
info!( info!(
context, context,
@@ -1681,7 +1685,8 @@ pub fn dc_set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64
&context.sql, &context.sql,
"UPDATE chats SET gossiped_timestamp=?;", "UPDATE chats SET gossiped_timestamp=?;",
params![timestamp], params![timestamp],
); )
.ok();
} }
} }
@@ -1764,6 +1769,7 @@ pub unsafe fn dc_remove_contact_from_chat(
success success
} }
// Should return Result
pub fn dc_set_group_explicitly_left(context: &Context, grpid: *const libc::c_char) { pub fn dc_set_group_explicitly_left(context: &Context, grpid: *const libc::c_char) {
if 0 == dc_is_group_explicitly_left(context, grpid) { if 0 == dc_is_group_explicitly_left(context, grpid) {
sql::execute( sql::execute(
@@ -1771,7 +1777,8 @@ pub fn dc_set_group_explicitly_left(context: &Context, grpid: *const libc::c_cha
&context.sql, &context.sql,
"INSERT INTO leftgrps (grpid) VALUES(?);", "INSERT INTO leftgrps (grpid) VALUES(?);",
params![as_str(grpid)], params![as_str(grpid)],
); )
.ok();
} }
} }

6
src/dc_configure.rs
View File

@@ -174,7 +174,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
param.addr = oauth2_addr; param.addr = oauth2_addr;
context context
.sql .sql
.set_config(context, "addr", Some(param.addr.as_str())); .set_config(context, "addr", Some(param.addr.as_str()))
.ok();
} }
if s.shall_stop_ongoing { if s.shall_stop_ongoing {
current_block = 2927484062889439186; current_block = 2927484062889439186;
@@ -966,7 +967,8 @@ pub unsafe fn dc_job_do_DC_JOB_CONFIGURE_IMAP(context: &Context, _job: *mut dc_j
context, context,
"configured", "configured",
1, 1,
); )
.ok();
if !s.shall_stop_ongoing if !s.shall_stop_ongoing
{ {
context.call_cb( context.call_cb(

5
src/dc_contact.rs
View File

@@ -421,7 +421,8 @@ pub fn dc_add_or_lookup_contact(
}, },
row_id row_id
], ],
); )
.ok();
if update_name { if update_name {
sql::execute( sql::execute(
@@ -429,7 +430,7 @@ pub fn dc_add_or_lookup_contact(
&context.sql, &context.sql,
"UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);", "UPDATE chats SET name=? WHERE type=? AND id IN(SELECT chat_id FROM chats_contacts WHERE contact_id=?);",
params![to_string(name), 100, row_id] params![to_string(name), 100, row_id]
); ).ok();
} }
unsafe { *sth_modified = 1 }; unsafe { *sth_modified = 1 };
} }

4
src/dc_imex.rs
View File

@@ -872,7 +872,7 @@ unsafe fn import_backup(context: &Context, backup_to_import: *const libc::c_char
return Err(format_err!("fail").into()); return Err(format_err!("fail").into());
} }
sql::execute(context, &context.sql, "DROP TABLE backup_blobs;", params![])?; sql::execute(context, &context.sql, "DROP TABLE backup_blobs;", params![])?;
sql::try_execute(context, &context.sql, "VACUUM;"); sql::try_execute(context, &context.sql, "VACUUM;").ok();
Ok(()) Ok(())
}, },
) )
@@ -906,7 +906,7 @@ unsafe fn export_backup(context: &Context, dir: *const libc::c_char) -> libc::c_
sql::housekeeping(context); sql::housekeeping(context);
sql::try_execute(context, &context.sql, "VACUUM;"); sql::try_execute(context, &context.sql, "VACUUM;").ok();
context.sql.close(context); context.sql.close(context);
let mut closed = true; let mut closed = true;
info!( info!(

2
src/dc_job.rs
View File

@@ -814,7 +814,7 @@ pub unsafe fn dc_job_add(
}, },
(timestamp + delay_seconds as i64) (timestamp + delay_seconds as i64)
] ]
); ).ok();
if thread == 100 { if thread == 100 {
dc_interrupt_imap_idle(context); dc_interrupt_imap_idle(context);

25
src/dc_loginparam.rs
View File

@@ -91,34 +91,39 @@ pub fn dc_loginparam_write(
let prefix = prefix.as_ref(); let prefix = prefix.as_ref();
let key = format!("{}addr", prefix); let key = format!("{}addr", prefix);
sql.set_config(context, key, Some(&loginparam.addr)); sql.set_config(context, key, Some(&loginparam.addr)).ok();
let key = format!("{}mail_server", prefix); let key = format!("{}mail_server", prefix);
sql.set_config(context, key, Some(&loginparam.mail_server)); sql.set_config(context, key, Some(&loginparam.mail_server))
.ok();
let key = format!("{}mail_port", prefix); let key = format!("{}mail_port", prefix);
sql.set_config_int(context, key, loginparam.mail_port); sql.set_config_int(context, key, loginparam.mail_port).ok();
let key = format!("{}mail_user", prefix); let key = format!("{}mail_user", prefix);
sql.set_config(context, key, Some(&loginparam.mail_user)); sql.set_config(context, key, Some(&loginparam.mail_user))
.ok();
let key = format!("{}mail_pw", prefix); let key = format!("{}mail_pw", prefix);
sql.set_config(context, key, Some(&loginparam.mail_pw)); sql.set_config(context, key, Some(&loginparam.mail_pw)).ok();
let key = format!("{}send_server", prefix); let key = format!("{}send_server", prefix);
sql.set_config(context, key, Some(&loginparam.send_server)); sql.set_config(context, key, Some(&loginparam.send_server))
.ok();
let key = format!("{}send_port", prefix); let key = format!("{}send_port", prefix);
sql.set_config_int(context, key, loginparam.send_port); sql.set_config_int(context, key, loginparam.send_port).ok();
let key = format!("{}send_user", prefix); let key = format!("{}send_user", prefix);
sql.set_config(context, key, Some(&loginparam.send_user)); sql.set_config(context, key, Some(&loginparam.send_user))
.ok();
let key = format!("{}send_pw", prefix); let key = format!("{}send_pw", prefix);
sql.set_config(context, key, Some(&loginparam.send_pw)); sql.set_config(context, key, Some(&loginparam.send_pw)).ok();
let key = format!("{}server_flags", prefix); let key = format!("{}server_flags", prefix);
sql.set_config_int(context, key, loginparam.server_flags); sql.set_config_int(context, key, loginparam.server_flags)
.ok();
} }
fn unset_empty(s: &String) -> Cow<String> { fn unset_empty(s: &String) -> Cow<String> {

6
src/dc_msg.rs
View File

@@ -1110,13 +1110,15 @@ pub unsafe fn dc_delete_msg_from_db(context: &Context, msg_id: uint32_t) {
&context.sql, &context.sql,
"DELETE FROM msgs WHERE id=?;", "DELETE FROM msgs WHERE id=?;",
params![(*msg).id as i32], params![(*msg).id as i32],
); )
.ok();
sql::execute( sql::execute(
context, context,
&context.sql, &context.sql,
"DELETE FROM msgs_mdns WHERE msg_id=?;", "DELETE FROM msgs_mdns WHERE msg_id=?;",
params![(*msg).id as i32], params![(*msg).id as i32],
); )
.ok();
} }
dc_msg_unref(msg); dc_msg_unref(msg);
} }

3
src/dc_receive_imf.rs
View File

@@ -1249,7 +1249,8 @@ unsafe fn create_or_lookup_group(
&context.sql, &context.sql,
"DELETE FROM chats_contacts WHERE chat_id=?;", "DELETE FROM chats_contacts WHERE chat_id=?;",
params![chat_id as i32], params![chat_id as i32],
); )
.ok();
if skip.is_null() || !dc_addr_cmp(&self_addr, as_str(skip)) { if skip.is_null() || !dc_addr_cmp(&self_addr, as_str(skip)) {
dc_add_to_chat_contacts_table(context, chat_id, 1); dc_add_to_chat_contacts_table(context, chat_id, 1);
} }

21
src/imap.rs
View File

@@ -1597,18 +1597,25 @@ impl Imap {
} }
} }
context.sql.set_config_int(context, "folders_configured", 3); context
.sql
.set_config_int(context, "folders_configured", 3)
.ok();
if let Some(ref mvbox_folder) = mvbox_folder { if let Some(ref mvbox_folder) = mvbox_folder {
context context
.sql .sql
.set_config(context, "configured_mvbox_folder", Some(mvbox_folder)); .set_config(context, "configured_mvbox_folder", Some(mvbox_folder))
.ok();
} }
if let Some(ref sentbox_folder) = sentbox_folder { if let Some(ref sentbox_folder) = sentbox_folder {
context.sql.set_config( context
context, .sql
"configured_sentbox_folder", .set_config(
Some(sentbox_folder.name()), context,
); "configured_sentbox_folder",
Some(sentbox_folder.name()),
)
.ok();
} }
} }

31
src/oauth2.rs
View File

@@ -48,11 +48,17 @@ pub fn dc_get_oauth2_url(
redirect_uri: impl AsRef<str>, redirect_uri: impl AsRef<str>,
) -> Option<String> { ) -> Option<String> {
if let Some(oauth2) = Oauth2::from_address(addr) { if let Some(oauth2) = Oauth2::from_address(addr) {
context.sql.set_config( if context
context, .sql
"oauth2_pending_redirect_uri", .set_config(
Some(redirect_uri.as_ref()), context,
); "oauth2_pending_redirect_uri",
Some(redirect_uri.as_ref()),
)
.is_err()
{
return None;
}
let oauth2_url = replace_in_uri(&oauth2.get_code, "$CLIENT_ID", &oauth2.client_id); let oauth2_url = replace_in_uri(&oauth2.get_code, "$CLIENT_ID", &oauth2.client_id);
let oauth2_url = replace_in_uri(&oauth2_url, "$REDIRECT_URI", redirect_uri.as_ref()); let oauth2_url = replace_in_uri(&oauth2_url, "$REDIRECT_URI", redirect_uri.as_ref());
@@ -157,10 +163,12 @@ pub fn dc_get_oauth2_access_token(
if let Some(ref token) = response.refresh_token { if let Some(ref token) = response.refresh_token {
context context
.sql .sql
.set_config(context, "oauth2_refresh_token", Some(token)); .set_config(context, "oauth2_refresh_token", Some(token))
.ok();
context context
.sql .sql
.set_config(context, "oauth2_refresh_token_for", Some(code.as_ref())); .set_config(context, "oauth2_refresh_token_for", Some(code.as_ref()))
.ok();
} }
// after that, save the access token. // after that, save the access token.
@@ -168,7 +176,8 @@ pub fn dc_get_oauth2_access_token(
if let Some(ref token) = response.access_token { if let Some(ref token) = response.access_token {
context context
.sql .sql
.set_config(context, "oauth2_access_token", Some(token)); .set_config(context, "oauth2_access_token", Some(token))
.ok();
let expires_in = response let expires_in = response
.expires_in .expires_in
// refresh a bet before // refresh a bet before
@@ -176,12 +185,14 @@ pub fn dc_get_oauth2_access_token(
.unwrap_or_else(|| 0); .unwrap_or_else(|| 0);
context context
.sql .sql
.set_config_int64(context, "oauth2_timestamp_expires", expires_in); .set_config_int64(context, "oauth2_timestamp_expires", expires_in)
.ok();
if update_redirect_uri_on_success { if update_redirect_uri_on_success {
context context
.sql .sql
.set_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref())); .set_config(context, "oauth2_redirect_uri", Some(redirect_uri.as_ref()))
.ok();
} }
} else { } else {
warn!(context, 0, "Failed to find OAuth2 access token"); warn!(context, 0, "Failed to find OAuth2 access token");

54
src/sql.rs
View File

@@ -173,7 +173,9 @@ impl Sql {
} }
/// Set private configuration options. /// Set private configuration options.
/// Setting `None` deletes the value. ///
/// Setting `None` deletes the value. On failure an error message
/// will already have been logged.
pub fn set_config( pub fn set_config(
&self, &self,
context: &Context, context: &Context,
@@ -439,7 +441,7 @@ fn open(
// cannot create the tables - maybe we cannot write? // cannot create the tables - maybe we cannot write?
return Err(Error::SqlFailedToOpen); return Err(Error::SqlFailedToOpen);
} else { } else {
sql.set_config_int(context, "dbversion", 0); sql.set_config_int(context, "dbversion", 0)?;
} }
} else { } else {
exists_before_update = 1; exists_before_update = 1;
@@ -464,7 +466,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 1; dbversion = 1;
sql.set_config_int(context, "dbversion", 1); sql.set_config_int(context, "dbversion", 1)?;
} }
if dbversion < 2 { if dbversion < 2 {
sql.execute( sql.execute(
@@ -472,7 +474,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 2; dbversion = 2;
sql.set_config_int(context, "dbversion", 2); sql.set_config_int(context, "dbversion", 2)?;
} }
if dbversion < 7 { if dbversion < 7 {
sql.execute( sql.execute(
@@ -486,7 +488,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 7; dbversion = 7;
sql.set_config_int(context, "dbversion", 7); sql.set_config_int(context, "dbversion", 7)?;
} }
if dbversion < 10 { if dbversion < 10 {
sql.execute( sql.execute(
@@ -504,7 +506,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 10; dbversion = 10;
sql.set_config_int(context, "dbversion", 10); sql.set_config_int(context, "dbversion", 10)?;
} }
if dbversion < 12 { if dbversion < 12 {
sql.execute( sql.execute(
@@ -516,7 +518,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 12; dbversion = 12;
sql.set_config_int(context, "dbversion", 12); sql.set_config_int(context, "dbversion", 12)?;
} }
if dbversion < 17 { if dbversion < 17 {
sql.execute( sql.execute(
@@ -530,7 +532,7 @@ fn open(
)?; )?;
sql.execute("CREATE INDEX msgs_index5 ON msgs (starred);", params![])?; sql.execute("CREATE INDEX msgs_index5 ON msgs (starred);", params![])?;
dbversion = 17; dbversion = 17;
sql.set_config_int(context, "dbversion", 17); sql.set_config_int(context, "dbversion", 17)?;
} }
if dbversion < 18 { if dbversion < 18 {
sql.execute( sql.execute(
@@ -539,7 +541,7 @@ fn open(
)?; )?;
sql.execute("ALTER TABLE acpeerstates ADD COLUMN gossip_key;", params![])?; sql.execute("ALTER TABLE acpeerstates ADD COLUMN gossip_key;", params![])?;
dbversion = 18; dbversion = 18;
sql.set_config_int(context, "dbversion", 18); sql.set_config_int(context, "dbversion", 18)?;
} }
if dbversion < 27 { if dbversion < 27 {
sql.execute("DELETE FROM msgs WHERE chat_id=1 OR chat_id=2;", params![])?; sql.execute("DELETE FROM msgs WHERE chat_id=1 OR chat_id=2;", params![])?;
@@ -556,7 +558,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 27; dbversion = 27;
sql.set_config_int(context, "dbversion", 27); sql.set_config_int(context, "dbversion", 27)?;
} }
if dbversion < 34 { if dbversion < 34 {
sql.execute( sql.execute(
@@ -585,7 +587,7 @@ fn open(
)?; )?;
recalc_fingerprints = 1; recalc_fingerprints = 1;
dbversion = 34; dbversion = 34;
sql.set_config_int(context, "dbversion", 34); sql.set_config_int(context, "dbversion", 34)?;
} }
if dbversion < 39 { if dbversion < 39 {
sql.execute( sql.execute(
@@ -615,7 +617,7 @@ fn open(
)?; )?;
} }
dbversion = 39; dbversion = 39;
sql.set_config_int(context, "dbversion", 39); sql.set_config_int(context, "dbversion", 39)?;
} }
if dbversion < 40 { if dbversion < 40 {
sql.execute( sql.execute(
@@ -623,22 +625,22 @@ fn open(
params![], params![],
)?; )?;
dbversion = 40; dbversion = 40;
sql.set_config_int(context, "dbversion", 40); sql.set_config_int(context, "dbversion", 40)?;
} }
if dbversion < 41 { if dbversion < 41 {
update_file_paths = 1; update_file_paths = 1;
dbversion = 41; dbversion = 41;
sql.set_config_int(context, "dbversion", 41); sql.set_config_int(context, "dbversion", 41)?;
} }
if dbversion < 42 { if dbversion < 42 {
sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?; sql.execute("UPDATE msgs SET txt='' WHERE type!=10", params![])?;
dbversion = 42; dbversion = 42;
sql.set_config_int(context, "dbversion", 42); sql.set_config_int(context, "dbversion", 42)?;
} }
if dbversion < 44 { if dbversion < 44 {
sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", params![])?; sql.execute("ALTER TABLE msgs ADD COLUMN mime_headers TEXT;", params![])?;
dbversion = 44; dbversion = 44;
sql.set_config_int(context, "dbversion", 44); sql.set_config_int(context, "dbversion", 44)?;
} }
if dbversion < 46 { if dbversion < 46 {
sql.execute( sql.execute(
@@ -650,7 +652,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 46; dbversion = 46;
sql.set_config_int(context, "dbversion", 46); sql.set_config_int(context, "dbversion", 46)?;
} }
if dbversion < 47 { if dbversion < 47 {
info!(context, 0, "[migration] v47"); info!(context, 0, "[migration] v47");
@@ -659,7 +661,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 47; dbversion = 47;
sql.set_config_int(context, "dbversion", 47); sql.set_config_int(context, "dbversion", 47)?;
} }
if dbversion < 48 { if dbversion < 48 {
info!(context, 0, "[migration] v48"); info!(context, 0, "[migration] v48");
@@ -673,7 +675,7 @@ fn open(
assert_eq!(DC_MOVE_STATE_MOVING as libc::c_int, 3); assert_eq!(DC_MOVE_STATE_MOVING as libc::c_int, 3);
dbversion = 48; dbversion = 48;
sql.set_config_int(context, "dbversion", 48); sql.set_config_int(context, "dbversion", 48)?;
} }
if dbversion < 49 { if dbversion < 49 {
info!(context, 0, "[migration] v49"); info!(context, 0, "[migration] v49");
@@ -682,15 +684,15 @@ fn open(
params![], params![],
)?; )?;
dbversion = 49; dbversion = 49;
sql.set_config_int(context, "dbversion", 49); sql.set_config_int(context, "dbversion", 49)?;
} }
if dbversion < 50 { if dbversion < 50 {
info!(context, 0, "[migration] v50"); info!(context, 0, "[migration] v50");
if 0 != exists_before_update { if 0 != exists_before_update {
sql.set_config_int(context, "show_emails", 2); sql.set_config_int(context, "show_emails", 2)?;
} }
dbversion = 50; dbversion = 50;
sql.set_config_int(context, "dbversion", 50); sql.set_config_int(context, "dbversion", 50)?;
} }
if dbversion < 53 { if dbversion < 53 {
info!(context, 0, "[migration] v53"); info!(context, 0, "[migration] v53");
@@ -723,7 +725,7 @@ fn open(
params![], params![],
)?; )?;
dbversion = 53; dbversion = 53;
sql.set_config_int(context, "dbversion", 53); sql.set_config_int(context, "dbversion", 53)?;
} }
if dbversion < 54 { if dbversion < 54 {
info!(context, 0, "[migration] v54"); info!(context, 0, "[migration] v54");
@@ -733,7 +735,7 @@ fn open(
)?; )?;
sql.execute("CREATE INDEX msgs_index6 ON msgs (location_id);", params![])?; sql.execute("CREATE INDEX msgs_index6 ON msgs (location_id);", params![])?;
dbversion = 54; dbversion = 54;
sql.set_config_int(context, "dbversion", 54); sql.set_config_int(context, "dbversion", 54)?;
} }
if dbversion < 55 { if dbversion < 55 {
sql.execute( sql.execute(
@@ -741,7 +743,7 @@ fn open(
params![], params![],
)?; )?;
sql.set_config_int(context, "dbversion", 55); sql.set_config_int(context, "dbversion", 55)?;
} }
if 0 != recalc_fingerprints { if 0 != recalc_fingerprints {
@@ -789,7 +791,7 @@ fn open(
NO_PARAMS, NO_PARAMS,
)?; )?;
sql.set_config(context, "backup_for", None); sql.set_config(context, "backup_for", None)?;
} }
} }