diff -ru a/test/test_client.c b/test/test_client.c --- a/test/test_client.c 2022-01-29 20:52:43.000000000 +0300 +++ b/test/test_client.c 2023-06-28 03:11:52.567358498 +0300 @@ -541,7 +541,7 @@ axc_buf * pt_buf_p; assert_int_equal(axc_pre_key_message_process(ct_buf_p, &addr_alice, ctx_b_p, &pt_buf_p), 0); - assert_string_equal(axc_buf_get_data(pt_buf_p), "hello"); + assert_string_equal((char const *)axc_buf_get_data(pt_buf_p), "hello"); assert_memory_equal(axc_buf_get_data(msg_buf_p), axc_buf_get_data(pt_buf_p), axc_buf_get_len(msg_buf_p)); assert_int_equal(axc_session_exists_initiated(&addr_alice, ctx_b_p), 1); diff -ru a/test/test_store.c b/test/test_store.c --- a/test/test_store.c 2022-01-29 20:52:43.000000000 +0300 +++ b/test/test_store.c 2023-06-28 03:21:09.631802550 +0300 @@ -17,11 +17,11 @@ #include "../src/axc.c" #include "../src/axc_store.c" -sqlite3 * db_p; -sqlite3_stmt * pstmt_p; +sqlite3 * db_p = NULL; +sqlite3_stmt * pstmt_p = NULL; char * db_filename = "test/test.sqlite"; -axc_context * ctx_global_p; +axc_context * ctx_global_p = NULL; signal_protocol_address addr_alice_42 = {.name = "alice", .name_len = 5, .device_id = 42}; signal_protocol_address addr_alice_21 = {.name = "alice", .name_len = 5, .device_id = 21}; @@ -145,24 +145,24 @@ assert_int_equal(db_conn_open(&db_p, &pstmt_p, stmt, ctx_global_p), 0); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "name"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "TEXT"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "name"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "TEXT"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "name_len"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "name_len"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "device_id"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "device_id"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "session_record"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "BLOB"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "session_record"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "BLOB"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "record_len"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "record_len"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_DONE); assert_int_equal(sqlite3_finalize(pstmt_p), SQLITE_OK); @@ -171,16 +171,16 @@ assert_int_equal(sqlite3_prepare_v2(db_p, stmt, -1, &pstmt_p, (void *) 0), SQLITE_OK); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "id"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "id"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "pre_key_record"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "BLOB"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "pre_key_record"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "BLOB"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "record_len"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "record_len"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_DONE); assert_int_equal(sqlite3_finalize(pstmt_p), SQLITE_OK); @@ -189,16 +189,16 @@ assert_int_equal(sqlite3_prepare_v2(db_p, stmt, -1, &pstmt_p, (void *) 0), SQLITE_OK); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "id"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "id"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "signed_pre_key_record"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "BLOB"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "signed_pre_key_record"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "BLOB"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "record_len"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "record_len"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_DONE); assert_int_equal(sqlite3_finalize(pstmt_p), SQLITE_OK); @@ -207,20 +207,20 @@ assert_int_equal(sqlite3_prepare_v2(db_p, stmt, -1, &pstmt_p, (void *) 0), SQLITE_OK); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "name"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "TEXT"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "name"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "TEXT"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "key"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "BLOB"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "key"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "BLOB"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "key_len"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "key_len"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "trusted"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "trusted"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_DONE); assert_int_equal(sqlite3_finalize(pstmt_p), SQLITE_OK); @@ -229,12 +229,12 @@ assert_int_equal(sqlite3_prepare_v2(db_p, stmt, -1, &pstmt_p, (void *) 0), SQLITE_OK); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "name"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "TEXT"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "name"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "TEXT"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 1), "property"); - assert_string_equal(sqlite3_column_text(pstmt_p, 2), "INTEGER"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 1), "property"); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 2), "INTEGER"); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_DONE); } @@ -335,7 +335,7 @@ assert_int_equal(db_conn_open(&db_p, &pstmt_p, "SELECT * FROM session_store WHERE name='alice' AND device_id IS 42;", ctx_global_p), 0); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 0), addr_alice_42.name); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 0), addr_alice_42.name); assert_int_equal(sqlite3_column_int(pstmt_p, 1), strlen(addr_alice_42.name)); assert_int_equal(sqlite3_column_int(pstmt_p, 2), addr_alice_42.device_id); assert_memory_equal(sqlite3_column_blob(pstmt_p, 3), bytes_1, bytes_1_len); @@ -405,7 +405,7 @@ assert_int_equal(axc_db_session_contains(&addr_alice, ctx_b_p), 0); assert_int_equal(axc_db_session_contains(&addr_bob, ctx_a_p), 0); - axc_bundle * bundle_bob_p; + axc_bundle * bundle_bob_p = NULL; assert_int_equal(axc_bundle_collect(AXC_PRE_KEYS_AMOUNT, ctx_b_p, &bundle_bob_p), 0); addr_bob.device_id = bundle_bob_p->registration_id; @@ -423,7 +423,7 @@ axc_buf * msg_buf_p = axc_buf_create((uint8_t *)data, strlen(data) + 1); assert_ptr_not_equal(msg_buf_p, (void *) 0); - axc_buf * ct_buf_p; + axc_buf * ct_buf_p = NULL; assert_int_equal(axc_message_encrypt_and_serialize(msg_buf_p, &addr_bob, ctx_a_p, &ct_buf_p), 0); uint32_t alice_id; @@ -431,7 +431,7 @@ addr_alice.device_id = alice_id; - axc_buf * pt_buf_p; + axc_buf * pt_buf_p = NULL; assert_int_equal(axc_pre_key_message_process(ct_buf_p, &addr_alice, ctx_b_p, &pt_buf_p), 0); assert_int_equal(axc_session_exists_initiated(&addr_bob, ctx_a_p), 1); @@ -713,7 +713,7 @@ assert_int_equal(db_conn_open(&db_p, &pstmt_p, stmt, ctx_global_p), 0); assert_int_equal(sqlite3_step(pstmt_p), SQLITE_ROW); - assert_string_equal(sqlite3_column_text(pstmt_p, 0), addr_alice_21.name); + assert_string_equal((char const *)sqlite3_column_text(pstmt_p, 0), addr_alice_21.name); assert_memory_equal(sqlite3_column_blob(pstmt_p, 1), bytes_1, bytes_1_len); assert_int_equal(sqlite3_column_int(pstmt_p, 2), bytes_1_len); assert_int_equal(sqlite3_column_int(pstmt_p, 3), IDENTITY_KEY_TRUSTED);