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

chore: fix compiler warnings (mut + unused assignments) (#40)

Browse Source 
* Stop allowing unused assignments

* test: remove unused assignments in cmdline

* chore: fix compiler warnings in dc_tools.rs

* chore: fix compiler warnings in dc_token.rs

* chore: fix compiler warnings in dc_strencode.rs

* chore: fix compiler warnings in dc_stock.rs

* chore: fix compiler warnings in dc_sqlite3.rs

* chore: fix compiler warnings in dc_simplify.rs

* chore: fix compiler warnings in dc_securejoin.rs

* chore: fix compiler warnings in dc_saxparser.rs

* chore: fix compiler warnings in dc_pgp.rs

* chore: fix compiler warnings in dc_param.rs

* chore: fix compiler warnings in dc_oauth2.rs

* chore: fix compiler warnings in dc_msg.rs

* chore: fix compiler warnings in dc_mimeparser.rs

* chore: fix compiler warnings in dc_mimefactory.rs

* chore: fix compiler warnings in dc_lot.rs

* chore: fix compiler warnings in dc_loginparams.rs

* chore: fix compiler warnings in dc_log.rs

* chore: fix compiler warnings in dc_location.rs

* chore: fix compiler warnings in dc_keyring.rs

* chore: fix compiler warnings in dc_key.rs

* chore: fix compiler warnings in dc_jsmn.rs

* chore: fix compiler warnings in dc_jobthread.rs

* chore: fix compiler warnings in dc_imex.rs

* chore: fix compiler warnings in dc_hash.rs

* chore: fix compiler warnings in dc_e2ee.rs

* chore: fix compiler warnings in dc_context.rs

* chore: fix compiler warnings in dc_contact.rs

* chore: fix compiler warnings in dc_chatlist.rs

* chore: fix compiler warnings in dc_chat.rs

* chore: fix compiler warnings in dc_array.rs

* chore: fix compiler warnings in dc_apeerstate.rs

* chore: fix compiler warnings in dc_aheader.rs

* chore: fix compiler warnings in dc_array.rs

* test: remove compiler warnings in test/stress.rs

* test: reduce compiler warnings in examples/repl/main.rs

* test: std:🧵:sleep_ms() is deprecated

* chore: remove unused variable in dc_sqlite3.rs

* chore: fix compiler warnings in dc_receive_imf.rs

* chore: fix compiler warnings in dc_job.rs

* chore: fix compiler warnings in dc_configure.rs

* Fix formatting
This commit is contained in:
Lars-Magnus Skog
2019-05-05 21:58:59 +02:00
committed by Friedel Ziegelmayer
parent 67f1d67de7
commit 2cf6cde5d1
40 changed files with 1635 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/dc_oauth2.rs
View File

@@ -51,8 +51,10 @@ pub unsafe fn dc_get_oauth2_url(
}
}
free(oauth2 as *mut libc::c_void);
return oauth2_url;
oauth2_url
}
unsafe fn replace_in_uri(
mut uri: *mut *mut libc::c_char,
mut key: *const libc::c_char,
@@ -64,10 +66,11 @@ unsafe fn replace_in_uri(
free(value_urlencoded as *mut libc::c_void);
};
}
unsafe fn get_info(mut addr: *const libc::c_char) -> *mut oauth2_t {
let mut oauth2: *mut oauth2_t = 0 as *mut oauth2_t;
let mut addr_normalized: *mut libc::c_char = 0 as *mut libc::c_char;
let mut domain: *const libc::c_char = 0 as *const libc::c_char;
let mut addr_normalized: *mut libc::c_char;
let mut domain: *const libc::c_char;
addr_normalized = dc_addr_normalize(addr);
domain = strchr(addr_normalized, '@' as i32);
if !(domain.is_null() || *domain.offset(0isize) as libc::c_int == 0i32) {
@@ -116,8 +119,10 @@ unsafe fn get_info(mut addr: *const libc::c_char) -> *mut oauth2_t {
}
}
free(addr_normalized as *mut libc::c_void);
return oauth2;
oauth2
}
// the following function may block due http-requests;
// must not be called from the main thread or by the ui!
pub unsafe fn dc_get_oauth2_access_token(
@@ -150,7 +155,7 @@ pub unsafe fn dc_get_oauth2_access_token(
end: 0,
size: 0,
}; 128];
let mut tok_cnt: libc::c_int = 0i32;
let mut tok_cnt: libc::c_int;
if code.is_null() || *code.offset(0isize) as libc::c_int == 0i32 {
dc_log_warning(
context,
@@ -452,6 +457,7 @@ pub unsafe fn dc_get_oauth2_access_token(
dc_strdup(0 as *const libc::c_char)
};
}
unsafe fn jsondup(mut json: *const libc::c_char, mut tok: *mut jsmntok_t) -> *mut libc::c_char {
if (*tok).type_0 as libc::c_uint == JSMN_STRING as libc::c_int as libc::c_uint
|| (*tok).type_0 as libc::c_uint == JSMN_PRIMITIVE as libc::c_int as libc::c_uint
@@ -461,8 +467,10 @@ unsafe fn jsondup(mut json: *const libc::c_char, mut tok: *mut jsmntok_t) -> *mu
((*tok).end - (*tok).start) as libc::c_ulong,
);
}
return strdup(b"\x00" as *const u8 as *const libc::c_char);
strdup(b"\x00" as *const u8 as *const libc::c_char)
}
unsafe extern "C" fn jsoneq(
mut json: *const libc::c_char,
mut tok: *mut jsmntok_t,
@@ -478,8 +486,11 @@ unsafe extern "C" fn jsoneq(
{
return 0i32;
}
return -1i32;
-1
}
// TODO should return bool /rtn
unsafe fn is_expired(mut context: &dc_context_t) -> libc::c_int {
let mut expire_timestamp: time_t = dc_sqlite3_get_config_int64(
context,
@@ -493,8 +504,10 @@ unsafe fn is_expired(mut context: &dc_context_t) -> libc::c_int {
if expire_timestamp > time(0 as *mut time_t) {
return 0i32;
}
return 1i32;
1
}
pub unsafe fn dc_get_oauth2_addr(
mut context: &dc_context_t,
mut addr: *const libc::c_char,
@@ -502,7 +515,7 @@ pub unsafe fn dc_get_oauth2_addr(
) -> *mut libc::c_char {
let mut access_token: *mut libc::c_char = 0 as *mut libc::c_char;
let mut addr_out: *mut libc::c_char = 0 as *mut libc::c_char;
let mut oauth2: *mut oauth2_t = 0 as *mut oauth2_t;
let mut oauth2: *mut oauth2_t;
if !({
oauth2 = get_info(addr);
oauth2.is_null()
@@ -518,8 +531,10 @@ pub unsafe fn dc_get_oauth2_addr(
}
free(access_token as *mut libc::c_void);
free(oauth2 as *mut libc::c_void);
return addr_out;
addr_out
}
unsafe fn get_oauth2_addr(
mut context: &dc_context_t,
mut oauth2: *const oauth2_t,
@@ -540,7 +555,7 @@ unsafe fn get_oauth2_addr(
end: 0,
size: 0,
}; 128];
let mut tok_cnt: libc::c_int = 0i32;
let mut tok_cnt: libc::c_int;
if !(access_token.is_null()
|| *access_token.offset(0isize) as libc::c_int == 0i32
|| oauth2.is_null())
@@ -608,5 +623,6 @@ unsafe fn get_oauth2_addr(
}
free(userinfo_url as *mut libc::c_void);
free(json as *mut libc::c_void);
return addr_out;
addr_out
}