Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +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

52
src/dc_receive_imf.rs
View File

@@ -36,28 +36,28 @@ pub unsafe fn dc_receive_imf(
/* the function returns the number of created messages in the database */
let mut incoming: libc::c_int = 1i32;
let mut incoming_origin: libc::c_int = 0i32;
let mut to_ids: *mut dc_array_t = 0 as *mut dc_array_t;
let mut to_ids: *mut dc_array_t;
let mut to_self: libc::c_int = 0i32;
let mut from_id: uint32_t = 0i32 as uint32_t;
let mut from_id_blocked: libc::c_int = 0i32;
let mut to_id: uint32_t = 0i32 as uint32_t;
let mut chat_id: uint32_t = 0i32 as uint32_t;
let mut chat_id_blocked: libc::c_int = 0i32;
let mut state: libc::c_int = 0i32;
let mut state: libc::c_int;
let mut hidden: libc::c_int = 0i32;
let mut msgrmsg: libc::c_int = 0i32;
let mut msgrmsg: libc::c_int;
let mut add_delete_job: libc::c_int = 0i32;
let mut insert_msg_id: uint32_t = 0i32 as uint32_t;
let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt;
let mut i: size_t = 0i32 as size_t;
let mut icnt: size_t = 0i32 as size_t;
let mut i: size_t;
let mut icnt: size_t;
/* Message-ID from the header */
let mut rfc724_mid: *mut libc::c_char = 0 as *mut libc::c_char;
let mut sort_timestamp: time_t = -1i32 as time_t;
let mut sent_timestamp: time_t = -1i32 as time_t;
let mut rcvd_timestamp: time_t = -1i32 as time_t;
let mut mime_parser: *mut dc_mimeparser_t = dc_mimeparser_new(context.get_blobdir(), context);
let mut field: *const mailimf_field = 0 as *const mailimf_field;
let mut field: *const mailimf_field;
let mut mime_in_reply_to: *mut libc::c_char = 0 as *mut libc::c_char;
let mut mime_references: *mut libc::c_char = 0 as *mut libc::c_char;
let mut created_db_entries: *mut carray = carray_new(16i32 as libc::c_uint);
@@ -470,7 +470,7 @@ pub unsafe fn dc_receive_imf(
);
let mut header_bytes: libc::c_int = imf_raw_bytes as libc::c_int;
if 0 != save_mime_headers {
let mut p: *mut libc::c_char = 0 as *mut libc::c_char;
let mut p: *mut libc::c_char;
p = strstr(
imf_raw_not_terminated,
b"\r\n\r\n\x00" as *const u8 as *const libc::c_char,
@@ -1001,7 +1001,6 @@ pub unsafe fn dc_receive_imf(
if let Some(create_event_to_send) = create_event_to_send {
let mut i_0: size_t = 0;
let mut icnt_0: size_t = carray_count(created_db_entries) as size_t;
i_0 = 0i32 as size_t;
while i_0 < icnt_0 {
((*context).cb)(
context,
@@ -1016,7 +1015,7 @@ pub unsafe fn dc_receive_imf(
carray_free(created_db_entries);
}
if !rr_event_to_send.is_null() {
let mut i_1: size_t = 0;
let mut i_1: size_t;
let mut icnt_1: size_t = carray_count(rr_event_to_send) as size_t;
i_1 = 0i32 as size_t;
while i_1 < icnt_1 {
@@ -1098,15 +1097,15 @@ unsafe fn create_or_lookup_group(
mut ret_chat_id: *mut uint32_t,
mut ret_chat_id_blocked: *mut libc::c_int,
) {
let mut group_explicitly_left: libc::c_int = 0;
let mut group_explicitly_left: libc::c_int;
let mut current_block: u64;
let mut chat_id: uint32_t = 0i32 as uint32_t;
let mut chat_id_blocked: libc::c_int = 0i32;
let mut chat_id_verified: libc::c_int = 0i32;
let mut grpid: *mut libc::c_char = 0 as *mut libc::c_char;
let mut grpname: *mut libc::c_char = 0 as *mut libc::c_char;
let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt;
let mut i: libc::c_int = 0i32;
let mut stmt: *mut sqlite3_stmt;
let mut i: libc::c_int;
let mut to_ids_cnt: libc::c_int = dc_array_get_cnt(to_ids) as libc::c_int;
let mut self_addr: *mut libc::c_char = 0 as *mut libc::c_char;
let mut recreate_member_list: libc::c_int = 0i32;
@@ -1130,8 +1129,8 @@ unsafe fn create_or_lookup_group(
}
set_better_msg(mime_parser, &mut better_msg);
/* search the grpid in the header */
let mut field: *mut mailimf_field = 0 as *mut mailimf_field;
let mut optional_field: *mut mailimf_optional_field = 0 as *mut mailimf_optional_field;
let mut field: *mut mailimf_field;
let mut optional_field: *mut mailimf_optional_field;
optional_field = dc_mimeparser_lookup_optional_field(
mime_parser,
b"Chat-Group-ID\x00" as *const u8 as *const libc::c_char,
@@ -1361,7 +1360,6 @@ unsafe fn create_or_lookup_group(
create_verified,
);
chat_id_blocked = create_blocked;
chat_id_verified = create_verified;
recreate_member_list = 1i32;
current_block = 200744462051969938;
}
@@ -1573,7 +1571,7 @@ unsafe fn create_or_lookup_adhoc_group(
let mut member_ids: *mut dc_array_t = 0 as *mut dc_array_t;
let mut chat_id: uint32_t = 0i32 as uint32_t;
let mut chat_id_blocked = 0;
let mut i = 0;
let mut i;
let mut chat_ids: *mut dc_array_t = 0 as *mut dc_array_t;
let mut chat_ids_str: *mut libc::c_char = 0 as *mut libc::c_char;
let mut q3: *mut libc::c_char = 0 as *mut libc::c_char;
@@ -1679,7 +1677,7 @@ unsafe fn create_group_record(
mut create_verified: libc::c_int,
) -> uint32_t {
let mut chat_id: uint32_t = 0i32 as uint32_t;
let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt;
let mut stmt: *mut sqlite3_stmt;
stmt = dc_sqlite3_prepare(
context,
&context.sql.clone().read().unwrap(),
@@ -1719,11 +1717,11 @@ unsafe fn create_adhoc_grp_id(
let mut member_addrs: *mut dc_array_t = dc_array_new(23i32 as size_t);
let mut member_ids_str: *mut libc::c_char =
dc_array_get_string(member_ids, b",\x00" as *const u8 as *const libc::c_char);
let mut stmt: *mut sqlite3_stmt = 0 as *mut sqlite3_stmt;
let mut q3: *mut libc::c_char = 0 as *mut libc::c_char;
let mut addr: *mut libc::c_char = 0 as *mut libc::c_char;
let mut i: libc::c_int = 0i32;
let mut iCnt: libc::c_int = 0i32;
let mut stmt: *mut sqlite3_stmt;
let mut q3: *mut libc::c_char;
let mut addr: *mut libc::c_char;
let mut i: libc::c_int;
let mut iCnt: libc::c_int;
let mut ret: *mut libc::c_char = 0 as *mut libc::c_char;
let mut member_cs: dc_strbuilder_t = dc_strbuilder_t {
buf: 0 as *mut libc::c_char,
@@ -1804,7 +1802,7 @@ unsafe fn search_chat_ids_by_contact_ids(
let mut chat_ids: *mut dc_array_t = dc_array_new(23i32 as size_t);
/* copy array, remove duplicates and SELF, sort by ID */
let mut i: libc::c_int = 0;
let mut i: libc::c_int;
let mut iCnt: libc::c_int = dc_array_get_cnt(unsorted_contact_ids) as libc::c_int;
if !(iCnt <= 0i32) {
i = 0i32;
@@ -2036,7 +2034,7 @@ unsafe fn dc_is_reply_to_known_message(
) -> libc::c_int {
/* check if the message is a reply to a known message; the replies are identified by the Message-ID from
`In-Reply-To`/`References:` (to support non-Delta-Clients) or from `Chat-Predecessor:` (Delta clients, see comment in dc_chat.c) */
let mut optional_field: *mut mailimf_optional_field = 0 as *mut mailimf_optional_field;
let mut optional_field: *mut mailimf_optional_field;
optional_field = dc_mimeparser_lookup_optional_field(
mime_parser,
b"Chat-Predecessor\x00" as *const u8 as *const libc::c_char,
@@ -2046,7 +2044,7 @@ unsafe fn dc_is_reply_to_known_message(
return 1i32;
}
}
let mut field: *mut mailimf_field = 0 as *mut mailimf_field;
let mut field: *mut mailimf_field;
field = dc_mimeparser_lookup_field(
mime_parser,
b"In-Reply-To\x00" as *const u8 as *const libc::c_char,
@@ -2084,7 +2082,7 @@ unsafe fn is_known_rfc724_mid_in_list(
mut mid_list: *const clist,
) -> libc::c_int {
if !mid_list.is_null() {
let mut cur: *mut clistiter = 0 as *mut clistiter;
let mut cur: *mut clistiter;
cur = (*mid_list).first;
while !cur.is_null() {
if 0 != is_known_rfc724_mid(
@@ -2136,7 +2134,7 @@ unsafe fn dc_is_reply_to_messenger_message(
- checks also if any of the referenced IDs are send by a messenger
- it is okay, if the referenced messages are moved to trash here
- no check for the Chat-* headers (function is only called if it is no messenger message itself) */
let mut field: *mut mailimf_field = 0 as *mut mailimf_field;
let mut field: *mut mailimf_field;
field = dc_mimeparser_lookup_field(
mime_parser,
b"In-Reply-To\x00" as *const u8 as *const libc::c_char,