From a4bca35a1a6e17187f821dbbdfe02798f7f1469e Mon Sep 17 00:00:00 2001 From: "zugz (tox)" Date: Sat, 17 Nov 2018 21:33:46 +0100 Subject: Add some const qualifiers (Implementing suggestions of sudden6) --- toxcore/tox.c | 87 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 44 deletions(-) (limited to 'toxcore/tox.c') diff --git a/toxcore/tox.c b/toxcore/tox.c index d848102e..d59094af 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c @@ -330,7 +330,7 @@ bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch) static State_Load_Status state_load_callback(void *outer, const uint8_t *data, uint32_t length, uint16_t type) { - Tox *tox = (Tox *)outer; + const Tox *tox = (const Tox *)outer; State_Load_Status status = STATE_LOAD_STATUS_CONTINUE; if (messenger_load_state_section(tox->m, data, length, type, &status) @@ -356,7 +356,7 @@ static State_Load_Status state_load_callback(void *outer, const uint8_t *data, u static int tox_load(Tox *tox, const uint8_t *data, uint32_t length) { uint32_t data32[2]; - uint32_t cookie_len = sizeof(data32); + const uint32_t cookie_len = sizeof(data32); if (length < cookie_len) { return -1; @@ -637,7 +637,7 @@ bool tox_bootstrap(Tox *tox, const char *host, uint16_t port, const uint8_t *pub IP_Port *root; - int32_t count = net_getipport(host, &root, TOX_SOCK_DGRAM); + const int32_t count = net_getipport(host, &root, TOX_SOCK_DGRAM); if (count == -1) { net_freeipport(root); @@ -713,8 +713,7 @@ Tox_Connection tox_self_get_connection_status(const Tox *tox) { const Messenger *m = tox->m; - // TODO(zugz): this can be const. Similarly throughout the file. - unsigned int ret = onion_connection_status(m->onion_c); + const unsigned int ret = onion_connection_status(m->onion_c); if (ret == 2) { return TOX_CONNECTION_UDP; @@ -913,7 +912,7 @@ uint32_t tox_friend_add(Tox *tox, const uint8_t *address, const uint8_t *message } Messenger *m = tox->m; - int32_t ret = m_addfriend(m, address, message, length); + const int32_t ret = m_addfriend(m, address, message, length); if (ret >= 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_ADD_OK); @@ -932,7 +931,7 @@ uint32_t tox_friend_add_norequest(Tox *tox, const uint8_t *public_key, Tox_Err_F } Messenger *m = tox->m; - int32_t ret = m_addfriend_norequest(m, public_key); + const int32_t ret = m_addfriend_norequest(m, public_key); if (ret >= 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_ADD_OK); @@ -946,7 +945,7 @@ uint32_t tox_friend_add_norequest(Tox *tox, const uint8_t *public_key, Tox_Err_F bool tox_friend_delete(Tox *tox, uint32_t friend_number, Tox_Err_Friend_Delete *error) { Messenger *m = tox->m; - int ret = m_delfriend(m, friend_number); + const int ret = m_delfriend(m, friend_number); // TODO(irungentoo): handle if realloc fails? if (ret == -1) { @@ -966,7 +965,7 @@ uint32_t tox_friend_by_public_key(const Tox *tox, const uint8_t *public_key, Tox } const Messenger *m = tox->m; - int32_t ret = getfriend_id(m, public_key); + const int32_t ret = getfriend_id(m, public_key); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_BY_PUBLIC_KEY_NOT_FOUND); @@ -1004,7 +1003,7 @@ bool tox_friend_exists(const Tox *tox, uint32_t friend_number) uint64_t tox_friend_get_last_online(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Get_Last_Online *error) { const Messenger *m = tox->m; - uint64_t timestamp = m_get_last_online(m, friend_number); + const uint64_t timestamp = m_get_last_online(m, friend_number); if (timestamp == UINT64_MAX) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_GET_LAST_ONLINE_FRIEND_NOT_FOUND); @@ -1033,7 +1032,7 @@ void tox_self_get_friend_list(const Tox *tox, uint32_t *friend_list) size_t tox_friend_get_name_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) { const Messenger *m = tox->m; - int ret = m_get_name_size(m, friend_number); + const int ret = m_get_name_size(m, friend_number); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1052,7 +1051,7 @@ bool tox_friend_get_name(const Tox *tox, uint32_t friend_number, uint8_t *name, } const Messenger *m = tox->m; - int ret = getname(m, friend_number, name); + const int ret = getname(m, friend_number, name); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1071,7 +1070,7 @@ void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *callback) size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) { const Messenger *m = tox->m; - int ret = m_get_statusmessage_size(m, friend_number); + const int ret = m_get_statusmessage_size(m, friend_number); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1114,7 +1113,7 @@ Tox_User_Status tox_friend_get_status(const Tox *tox, uint32_t friend_number, To { const Messenger *m = tox->m; - int ret = m_get_userstatus(m, friend_number); + const int ret = m_get_userstatus(m, friend_number); if (ret == USERSTATUS_INVALID) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1134,7 +1133,7 @@ Tox_Connection tox_friend_get_connection_status(const Tox *tox, uint32_t friend_ { const Messenger *m = tox->m; - int ret = m_get_friend_connectionstatus(m, friend_number); + const int ret = m_get_friend_connectionstatus(m, friend_number); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1153,7 +1152,7 @@ void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_statu bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) { const Messenger *m = tox->m; - int ret = m_get_istyping(m, friend_number); + const int ret = m_get_istyping(m, friend_number); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); @@ -1264,7 +1263,7 @@ bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, To Tox_Err_File_Control *error) { Messenger *m = tox->m; - int ret = file_control(m, friend_number, file_number, control); + const int ret = file_control(m, friend_number, file_number, control); if (ret == 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FILE_CONTROL_OK); @@ -1313,7 +1312,7 @@ bool tox_file_seek(Tox *tox, uint32_t friend_number, uint32_t file_number, uint6 Tox_Err_File_Seek *error) { Messenger *m = tox->m; - int ret = file_seek(m, friend_number, file_number, position); + const int ret = file_seek(m, friend_number, file_number, position); if (ret == 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEEK_OK); @@ -1365,7 +1364,7 @@ bool tox_file_get_file_id(const Tox *tox, uint32_t friend_number, uint32_t file_ } const Messenger *m = tox->m; - int ret = file_get_id(m, friend_number, file_number, file_id); + const int ret = file_get_id(m, friend_number, file_number, file_id); if (ret == 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FILE_GET_OK); @@ -1398,7 +1397,7 @@ uint32_t tox_file_send(Tox *tox, uint32_t friend_number, uint32_t kind, uint64_t } Messenger *m = tox->m; - long int file_num = new_filesender(m, friend_number, kind, file_size, file_id, filename, filename_length); + const long int file_num = new_filesender(m, friend_number, kind, file_size, file_id, filename, filename_length); if (file_num >= 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEND_OK); @@ -1431,7 +1430,7 @@ bool tox_file_send_chunk(Tox *tox, uint32_t friend_number, uint32_t file_number, size_t length, Tox_Err_File_Send_Chunk *error) { Messenger *m = tox->m; - int ret = file_data(m, friend_number, file_number, position, data, length); + const int ret = file_data(m, friend_number, file_number, position, data, length); if (ret == 0) { SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEND_CHUNK_OK); @@ -1520,7 +1519,7 @@ void tox_callback_conference_peer_list_changed(Tox *tox, tox_conference_peer_lis uint32_t tox_conference_new(Tox *tox, Tox_Err_Conference_New *error) { Messenger *m = tox->m; - int ret = add_groupchat(m->conferences_object, GROUPCHAT_TYPE_TEXT); + const int ret = add_groupchat(m->conferences_object, GROUPCHAT_TYPE_TEXT); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_INIT); @@ -1534,7 +1533,7 @@ uint32_t tox_conference_new(Tox *tox, Tox_Err_Conference_New *error) bool tox_conference_delete(Tox *tox, uint32_t conference_number, Tox_Err_Conference_Delete *error) { Messenger *m = tox->m; - int ret = del_groupchat(m->conferences_object, conference_number, true); + const int ret = del_groupchat(m->conferences_object, conference_number, true); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND); @@ -1548,7 +1547,7 @@ bool tox_conference_delete(Tox *tox, uint32_t conference_number, Tox_Err_Confere uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_number_peers(m->conferences_object, conference_number, false); + const int ret = group_number_peers(m->conferences_object, conference_number, false); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND); @@ -1563,7 +1562,7 @@ size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t conference_num Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peername_size(m->conferences_object, conference_number, peer_number, false); + const int ret = group_peername_size(m->conferences_object, conference_number, peer_number, false); switch (ret) { case -1: @@ -1583,7 +1582,7 @@ bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, ui Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peername(m->conferences_object, conference_number, peer_number, name, false); + const int ret = group_peername(m->conferences_object, conference_number, peer_number, name, false); switch (ret) { case -1: @@ -1603,7 +1602,7 @@ bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_numb uint8_t *public_key, Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peer_pubkey(m->conferences_object, conference_number, peer_number, public_key, false); + const int ret = group_peer_pubkey(m->conferences_object, conference_number, peer_number, public_key, false); switch (ret) { case -1: @@ -1623,7 +1622,7 @@ bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_numb Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peernumber_is_ours(m->conferences_object, conference_number, peer_number); + const int ret = group_peernumber_is_ours(m->conferences_object, conference_number, peer_number); switch (ret) { case -1: @@ -1647,7 +1646,7 @@ uint32_t tox_conference_offline_peer_count(const Tox *tox, uint32_t conference_n Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_number_peers(m->conferences_object, conference_number, true); + const int ret = group_number_peers(m->conferences_object, conference_number, true); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND); @@ -1663,7 +1662,7 @@ size_t tox_conference_offline_peer_get_name_size(const Tox *tox, uint32_t confer Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peername_size(m->conferences_object, conference_number, offline_peer_number, true); + const int ret = group_peername_size(m->conferences_object, conference_number, offline_peer_number, true); switch (ret) { case -1: @@ -1684,7 +1683,7 @@ bool tox_conference_offline_peer_get_name(const Tox *tox, uint32_t conference_nu Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peername(m->conferences_object, conference_number, offline_peer_number, name, true); + const int ret = group_peername(m->conferences_object, conference_number, offline_peer_number, name, true); switch (ret) { case -1: @@ -1705,7 +1704,7 @@ bool tox_conference_offline_peer_get_public_key(const Tox *tox, uint32_t confere uint8_t *public_key, Tox_Err_Conference_Peer_Query *error) { const Messenger *m = tox->m; - int ret = group_peer_pubkey(m->conferences_object, conference_number, offline_peer_number, public_key, true); + const int ret = group_peer_pubkey(m->conferences_object, conference_number, offline_peer_number, public_key, true); switch (ret) { case -1: @@ -1727,7 +1726,7 @@ uint64_t tox_conference_offline_peer_get_last_active(const Tox *tox, uint32_t co { const Messenger *m = tox->m; uint64_t last_active = UINT64_MAX; - int ret = group_frozen_last_active(m->conferences_object, conference_number, offline_peer_number, &last_active); + const int ret = group_frozen_last_active(m->conferences_object, conference_number, offline_peer_number, &last_active); switch (ret) { case -1: @@ -1747,7 +1746,7 @@ bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference Tox_Err_Conference_Invite *error) { Messenger *m = tox->m; - int ret = invite_friend(m->conferences_object, friend_number, conference_number); + const int ret = invite_friend(m->conferences_object, friend_number, conference_number); switch (ret) { case -1: @@ -1771,7 +1770,7 @@ uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *co Tox_Err_Conference_Join *error) { Messenger *m = tox->m; - int ret = join_groupchat(m->conferences_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length); + const int ret = join_groupchat(m->conferences_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length); switch (ret) { case -1: @@ -1840,7 +1839,7 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, Tox_Messa size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Title *error) { const Messenger *m = tox->m; - int ret = group_title_get_size(m->conferences_object, conference_number); + const int ret = group_title_get_size(m->conferences_object, conference_number); switch (ret) { case -1: @@ -1860,7 +1859,7 @@ bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_ Tox_Err_Conference_Title *error) { const Messenger *m = tox->m; - int ret = group_title_get(m->conferences_object, conference_number, title); + const int ret = group_title_get(m->conferences_object, conference_number, title); switch (ret) { case -1: @@ -1880,7 +1879,7 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_ Tox_Err_Conference_Title *error) { Messenger *m = tox->m; - int ret = group_title_send(m->conferences_object, conference_number, title, length); + const int ret = group_title_send(m->conferences_object, conference_number, title, length); switch (ret) { case -1: @@ -1909,7 +1908,7 @@ size_t tox_conference_get_chatlist_size(const Tox *tox) void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist) { const Messenger *m = tox->m; - size_t list_size = tox_conference_get_chatlist_size(tox); + const size_t list_size = tox_conference_get_chatlist_size(tox); copy_chatlist(m->conferences_object, chatlist, list_size); } @@ -1917,7 +1916,7 @@ Tox_Conference_Type tox_conference_get_type(const Tox *tox, uint32_t conference_ Tox_Err_Conference_Get_Type *error) { const Messenger *m = tox->m; - int ret = group_get_type(m->conferences_object, conference_number); + const int ret = group_get_type(m->conferences_object, conference_number); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND); @@ -1946,7 +1945,7 @@ uint32_t tox_conference_by_id(const Tox *tox, const uint8_t *id, Tox_Err_Confere return UINT32_MAX; } - int32_t ret = conference_by_id(tox->m->conferences_object, id); + const int32_t ret = conference_by_id(tox->m->conferences_object, id); if (ret == -1) { SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_BY_ID_NOT_FOUND); @@ -2031,7 +2030,7 @@ bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_ return 0; } - int ret = m_send_custom_lossy_packet(m, friend_number, data, length); + const int ret = m_send_custom_lossy_packet(m, friend_number, data, length); set_custom_packet_error(ret, error); @@ -2062,7 +2061,7 @@ bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uin return 0; } - int ret = send_custom_lossless_packet(m, friend_number, data, length); + const int ret = send_custom_lossless_packet(m, friend_number, data, length); set_custom_packet_error(ret, error); @@ -2089,7 +2088,7 @@ void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id) uint16_t tox_self_get_udp_port(const Tox *tox, Tox_Err_Get_Port *error) { const Messenger *m = tox->m; - uint16_t port = net_htons(net_port(m->net)); + const uint16_t port = net_htons(net_port(m->net)); if (port) { SET_ERROR_PARAMETER(error, TOX_ERR_GET_PORT_OK); -- cgit v1.2.3