summaryrefslogtreecommitdiff
path: root/toxcore/tox.c
diff options
context:
space:
mode:
authorzugz (tox) <mbays+tox@sdf.org>2018-11-17 21:33:46 +0100
committerzugz (tox) <mbays+tox@sdf.org>2019-01-12 22:38:51 +0100
commita4bca35a1a6e17187f821dbbdfe02798f7f1469e (patch)
tree3de607d558683b9d980f63c1ead00556e89248df /toxcore/tox.c
parent91ff39599d97d610321970161ba6410f3bdd9b51 (diff)
Add some const qualifiers
(Implementing suggestions of sudden6)
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r--toxcore/tox.c87
1 files changed, 43 insertions, 44 deletions
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)
330 330
331static State_Load_Status state_load_callback(void *outer, const uint8_t *data, uint32_t length, uint16_t type) 331static State_Load_Status state_load_callback(void *outer, const uint8_t *data, uint32_t length, uint16_t type)
332{ 332{
333 Tox *tox = (Tox *)outer; 333 const Tox *tox = (const Tox *)outer;
334 State_Load_Status status = STATE_LOAD_STATUS_CONTINUE; 334 State_Load_Status status = STATE_LOAD_STATUS_CONTINUE;
335 335
336 if (messenger_load_state_section(tox->m, data, length, type, &status) 336 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
356static int tox_load(Tox *tox, const uint8_t *data, uint32_t length) 356static int tox_load(Tox *tox, const uint8_t *data, uint32_t length)
357{ 357{
358 uint32_t data32[2]; 358 uint32_t data32[2];
359 uint32_t cookie_len = sizeof(data32); 359 const uint32_t cookie_len = sizeof(data32);
360 360
361 if (length < cookie_len) { 361 if (length < cookie_len) {
362 return -1; 362 return -1;
@@ -637,7 +637,7 @@ bool tox_bootstrap(Tox *tox, const char *host, uint16_t port, const uint8_t *pub
637 637
638 IP_Port *root; 638 IP_Port *root;
639 639
640 int32_t count = net_getipport(host, &root, TOX_SOCK_DGRAM); 640 const int32_t count = net_getipport(host, &root, TOX_SOCK_DGRAM);
641 641
642 if (count == -1) { 642 if (count == -1) {
643 net_freeipport(root); 643 net_freeipport(root);
@@ -713,8 +713,7 @@ Tox_Connection tox_self_get_connection_status(const Tox *tox)
713{ 713{
714 const Messenger *m = tox->m; 714 const Messenger *m = tox->m;
715 715
716 // TODO(zugz): this can be const. Similarly throughout the file. 716 const unsigned int ret = onion_connection_status(m->onion_c);
717 unsigned int ret = onion_connection_status(m->onion_c);
718 717
719 if (ret == 2) { 718 if (ret == 2) {
720 return TOX_CONNECTION_UDP; 719 return TOX_CONNECTION_UDP;
@@ -913,7 +912,7 @@ uint32_t tox_friend_add(Tox *tox, const uint8_t *address, const uint8_t *message
913 } 912 }
914 913
915 Messenger *m = tox->m; 914 Messenger *m = tox->m;
916 int32_t ret = m_addfriend(m, address, message, length); 915 const int32_t ret = m_addfriend(m, address, message, length);
917 916
918 if (ret >= 0) { 917 if (ret >= 0) {
919 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_ADD_OK); 918 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
932 } 931 }
933 932
934 Messenger *m = tox->m; 933 Messenger *m = tox->m;
935 int32_t ret = m_addfriend_norequest(m, public_key); 934 const int32_t ret = m_addfriend_norequest(m, public_key);
936 935
937 if (ret >= 0) { 936 if (ret >= 0) {
938 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_ADD_OK); 937 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
946bool tox_friend_delete(Tox *tox, uint32_t friend_number, Tox_Err_Friend_Delete *error) 945bool tox_friend_delete(Tox *tox, uint32_t friend_number, Tox_Err_Friend_Delete *error)
947{ 946{
948 Messenger *m = tox->m; 947 Messenger *m = tox->m;
949 int ret = m_delfriend(m, friend_number); 948 const int ret = m_delfriend(m, friend_number);
950 949
951 // TODO(irungentoo): handle if realloc fails? 950 // TODO(irungentoo): handle if realloc fails?
952 if (ret == -1) { 951 if (ret == -1) {
@@ -966,7 +965,7 @@ uint32_t tox_friend_by_public_key(const Tox *tox, const uint8_t *public_key, Tox
966 } 965 }
967 966
968 const Messenger *m = tox->m; 967 const Messenger *m = tox->m;
969 int32_t ret = getfriend_id(m, public_key); 968 const int32_t ret = getfriend_id(m, public_key);
970 969
971 if (ret == -1) { 970 if (ret == -1) {
972 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_BY_PUBLIC_KEY_NOT_FOUND); 971 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)
1004uint64_t tox_friend_get_last_online(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Get_Last_Online *error) 1003uint64_t tox_friend_get_last_online(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Get_Last_Online *error)
1005{ 1004{
1006 const Messenger *m = tox->m; 1005 const Messenger *m = tox->m;
1007 uint64_t timestamp = m_get_last_online(m, friend_number); 1006 const uint64_t timestamp = m_get_last_online(m, friend_number);
1008 1007
1009 if (timestamp == UINT64_MAX) { 1008 if (timestamp == UINT64_MAX) {
1010 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_GET_LAST_ONLINE_FRIEND_NOT_FOUND); 1009 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)
1033size_t tox_friend_get_name_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) 1032size_t tox_friend_get_name_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error)
1034{ 1033{
1035 const Messenger *m = tox->m; 1034 const Messenger *m = tox->m;
1036 int ret = m_get_name_size(m, friend_number); 1035 const int ret = m_get_name_size(m, friend_number);
1037 1036
1038 if (ret == -1) { 1037 if (ret == -1) {
1039 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1038 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,
1052 } 1051 }
1053 1052
1054 const Messenger *m = tox->m; 1053 const Messenger *m = tox->m;
1055 int ret = getname(m, friend_number, name); 1054 const int ret = getname(m, friend_number, name);
1056 1055
1057 if (ret == -1) { 1056 if (ret == -1) {
1058 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1057 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)
1071size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) 1070size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error)
1072{ 1071{
1073 const Messenger *m = tox->m; 1072 const Messenger *m = tox->m;
1074 int ret = m_get_statusmessage_size(m, friend_number); 1073 const int ret = m_get_statusmessage_size(m, friend_number);
1075 1074
1076 if (ret == -1) { 1075 if (ret == -1) {
1077 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1076 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
1114{ 1113{
1115 const Messenger *m = tox->m; 1114 const Messenger *m = tox->m;
1116 1115
1117 int ret = m_get_userstatus(m, friend_number); 1116 const int ret = m_get_userstatus(m, friend_number);
1118 1117
1119 if (ret == USERSTATUS_INVALID) { 1118 if (ret == USERSTATUS_INVALID) {
1120 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1119 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_
1134{ 1133{
1135 const Messenger *m = tox->m; 1134 const Messenger *m = tox->m;
1136 1135
1137 int ret = m_get_friend_connectionstatus(m, friend_number); 1136 const int ret = m_get_friend_connectionstatus(m, friend_number);
1138 1137
1139 if (ret == -1) { 1138 if (ret == -1) {
1140 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1139 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
1153bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error) 1152bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, Tox_Err_Friend_Query *error)
1154{ 1153{
1155 const Messenger *m = tox->m; 1154 const Messenger *m = tox->m;
1156 int ret = m_get_istyping(m, friend_number); 1155 const int ret = m_get_istyping(m, friend_number);
1157 1156
1158 if (ret == -1) { 1157 if (ret == -1) {
1159 SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND); 1158 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
1264 Tox_Err_File_Control *error) 1263 Tox_Err_File_Control *error)
1265{ 1264{
1266 Messenger *m = tox->m; 1265 Messenger *m = tox->m;
1267 int ret = file_control(m, friend_number, file_number, control); 1266 const int ret = file_control(m, friend_number, file_number, control);
1268 1267
1269 if (ret == 0) { 1268 if (ret == 0) {
1270 SET_ERROR_PARAMETER(error, TOX_ERR_FILE_CONTROL_OK); 1269 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
1313 Tox_Err_File_Seek *error) 1312 Tox_Err_File_Seek *error)
1314{ 1313{
1315 Messenger *m = tox->m; 1314 Messenger *m = tox->m;
1316 int ret = file_seek(m, friend_number, file_number, position); 1315 const int ret = file_seek(m, friend_number, file_number, position);
1317 1316
1318 if (ret == 0) { 1317 if (ret == 0) {
1319 SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEEK_OK); 1318 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_
1365 } 1364 }
1366 1365
1367 const Messenger *m = tox->m; 1366 const Messenger *m = tox->m;
1368 int ret = file_get_id(m, friend_number, file_number, file_id); 1367 const int ret = file_get_id(m, friend_number, file_number, file_id);
1369 1368
1370 if (ret == 0) { 1369 if (ret == 0) {
1371 SET_ERROR_PARAMETER(error, TOX_ERR_FILE_GET_OK); 1370 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
1398 } 1397 }
1399 1398
1400 Messenger *m = tox->m; 1399 Messenger *m = tox->m;
1401 long int file_num = new_filesender(m, friend_number, kind, file_size, file_id, filename, filename_length); 1400 const long int file_num = new_filesender(m, friend_number, kind, file_size, file_id, filename, filename_length);
1402 1401
1403 if (file_num >= 0) { 1402 if (file_num >= 0) {
1404 SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEND_OK); 1403 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,
1431 size_t length, Tox_Err_File_Send_Chunk *error) 1430 size_t length, Tox_Err_File_Send_Chunk *error)
1432{ 1431{
1433 Messenger *m = tox->m; 1432 Messenger *m = tox->m;
1434 int ret = file_data(m, friend_number, file_number, position, data, length); 1433 const int ret = file_data(m, friend_number, file_number, position, data, length);
1435 1434
1436 if (ret == 0) { 1435 if (ret == 0) {
1437 SET_ERROR_PARAMETER(error, TOX_ERR_FILE_SEND_CHUNK_OK); 1436 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
1520uint32_t tox_conference_new(Tox *tox, Tox_Err_Conference_New *error) 1519uint32_t tox_conference_new(Tox *tox, Tox_Err_Conference_New *error)
1521{ 1520{
1522 Messenger *m = tox->m; 1521 Messenger *m = tox->m;
1523 int ret = add_groupchat(m->conferences_object, GROUPCHAT_TYPE_TEXT); 1522 const int ret = add_groupchat(m->conferences_object, GROUPCHAT_TYPE_TEXT);
1524 1523
1525 if (ret == -1) { 1524 if (ret == -1) {
1526 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_INIT); 1525 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)
1534bool tox_conference_delete(Tox *tox, uint32_t conference_number, Tox_Err_Conference_Delete *error) 1533bool tox_conference_delete(Tox *tox, uint32_t conference_number, Tox_Err_Conference_Delete *error)
1535{ 1534{
1536 Messenger *m = tox->m; 1535 Messenger *m = tox->m;
1537 int ret = del_groupchat(m->conferences_object, conference_number, true); 1536 const int ret = del_groupchat(m->conferences_object, conference_number, true);
1538 1537
1539 if (ret == -1) { 1538 if (ret == -1) {
1540 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND); 1539 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
1548uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Peer_Query *error) 1547uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Peer_Query *error)
1549{ 1548{
1550 const Messenger *m = tox->m; 1549 const Messenger *m = tox->m;
1551 int ret = group_number_peers(m->conferences_object, conference_number, false); 1550 const int ret = group_number_peers(m->conferences_object, conference_number, false);
1552 1551
1553 if (ret == -1) { 1552 if (ret == -1) {
1554 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND); 1553 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
1563 Tox_Err_Conference_Peer_Query *error) 1562 Tox_Err_Conference_Peer_Query *error)
1564{ 1563{
1565 const Messenger *m = tox->m; 1564 const Messenger *m = tox->m;
1566 int ret = group_peername_size(m->conferences_object, conference_number, peer_number, false); 1565 const int ret = group_peername_size(m->conferences_object, conference_number, peer_number, false);
1567 1566
1568 switch (ret) { 1567 switch (ret) {
1569 case -1: 1568 case -1:
@@ -1583,7 +1582,7 @@ bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, ui
1583 Tox_Err_Conference_Peer_Query *error) 1582 Tox_Err_Conference_Peer_Query *error)
1584{ 1583{
1585 const Messenger *m = tox->m; 1584 const Messenger *m = tox->m;
1586 int ret = group_peername(m->conferences_object, conference_number, peer_number, name, false); 1585 const int ret = group_peername(m->conferences_object, conference_number, peer_number, name, false);
1587 1586
1588 switch (ret) { 1587 switch (ret) {
1589 case -1: 1588 case -1:
@@ -1603,7 +1602,7 @@ bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_numb
1603 uint8_t *public_key, Tox_Err_Conference_Peer_Query *error) 1602 uint8_t *public_key, Tox_Err_Conference_Peer_Query *error)
1604{ 1603{
1605 const Messenger *m = tox->m; 1604 const Messenger *m = tox->m;
1606 int ret = group_peer_pubkey(m->conferences_object, conference_number, peer_number, public_key, false); 1605 const int ret = group_peer_pubkey(m->conferences_object, conference_number, peer_number, public_key, false);
1607 1606
1608 switch (ret) { 1607 switch (ret) {
1609 case -1: 1608 case -1:
@@ -1623,7 +1622,7 @@ bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_numb
1623 Tox_Err_Conference_Peer_Query *error) 1622 Tox_Err_Conference_Peer_Query *error)
1624{ 1623{
1625 const Messenger *m = tox->m; 1624 const Messenger *m = tox->m;
1626 int ret = group_peernumber_is_ours(m->conferences_object, conference_number, peer_number); 1625 const int ret = group_peernumber_is_ours(m->conferences_object, conference_number, peer_number);
1627 1626
1628 switch (ret) { 1627 switch (ret) {
1629 case -1: 1628 case -1:
@@ -1647,7 +1646,7 @@ uint32_t tox_conference_offline_peer_count(const Tox *tox, uint32_t conference_n
1647 Tox_Err_Conference_Peer_Query *error) 1646 Tox_Err_Conference_Peer_Query *error)
1648{ 1647{
1649 const Messenger *m = tox->m; 1648 const Messenger *m = tox->m;
1650 int ret = group_number_peers(m->conferences_object, conference_number, true); 1649 const int ret = group_number_peers(m->conferences_object, conference_number, true);
1651 1650
1652 if (ret == -1) { 1651 if (ret == -1) {
1653 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND); 1652 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
1663 Tox_Err_Conference_Peer_Query *error) 1662 Tox_Err_Conference_Peer_Query *error)
1664{ 1663{
1665 const Messenger *m = tox->m; 1664 const Messenger *m = tox->m;
1666 int ret = group_peername_size(m->conferences_object, conference_number, offline_peer_number, true); 1665 const int ret = group_peername_size(m->conferences_object, conference_number, offline_peer_number, true);
1667 1666
1668 switch (ret) { 1667 switch (ret) {
1669 case -1: 1668 case -1:
@@ -1684,7 +1683,7 @@ bool tox_conference_offline_peer_get_name(const Tox *tox, uint32_t conference_nu
1684 Tox_Err_Conference_Peer_Query *error) 1683 Tox_Err_Conference_Peer_Query *error)
1685{ 1684{
1686 const Messenger *m = tox->m; 1685 const Messenger *m = tox->m;
1687 int ret = group_peername(m->conferences_object, conference_number, offline_peer_number, name, true); 1686 const int ret = group_peername(m->conferences_object, conference_number, offline_peer_number, name, true);
1688 1687
1689 switch (ret) { 1688 switch (ret) {
1690 case -1: 1689 case -1:
@@ -1705,7 +1704,7 @@ bool tox_conference_offline_peer_get_public_key(const Tox *tox, uint32_t confere
1705 uint8_t *public_key, Tox_Err_Conference_Peer_Query *error) 1704 uint8_t *public_key, Tox_Err_Conference_Peer_Query *error)
1706{ 1705{
1707 const Messenger *m = tox->m; 1706 const Messenger *m = tox->m;
1708 int ret = group_peer_pubkey(m->conferences_object, conference_number, offline_peer_number, public_key, true); 1707 const int ret = group_peer_pubkey(m->conferences_object, conference_number, offline_peer_number, public_key, true);
1709 1708
1710 switch (ret) { 1709 switch (ret) {
1711 case -1: 1710 case -1:
@@ -1727,7 +1726,7 @@ uint64_t tox_conference_offline_peer_get_last_active(const Tox *tox, uint32_t co
1727{ 1726{
1728 const Messenger *m = tox->m; 1727 const Messenger *m = tox->m;
1729 uint64_t last_active = UINT64_MAX; 1728 uint64_t last_active = UINT64_MAX;
1730 int ret = group_frozen_last_active(m->conferences_object, conference_number, offline_peer_number, &last_active); 1729 const int ret = group_frozen_last_active(m->conferences_object, conference_number, offline_peer_number, &last_active);
1731 1730
1732 switch (ret) { 1731 switch (ret) {
1733 case -1: 1732 case -1:
@@ -1747,7 +1746,7 @@ bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference
1747 Tox_Err_Conference_Invite *error) 1746 Tox_Err_Conference_Invite *error)
1748{ 1747{
1749 Messenger *m = tox->m; 1748 Messenger *m = tox->m;
1750 int ret = invite_friend(m->conferences_object, friend_number, conference_number); 1749 const int ret = invite_friend(m->conferences_object, friend_number, conference_number);
1751 1750
1752 switch (ret) { 1751 switch (ret) {
1753 case -1: 1752 case -1:
@@ -1771,7 +1770,7 @@ uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *co
1771 Tox_Err_Conference_Join *error) 1770 Tox_Err_Conference_Join *error)
1772{ 1771{
1773 Messenger *m = tox->m; 1772 Messenger *m = tox->m;
1774 int ret = join_groupchat(m->conferences_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length); 1773 const int ret = join_groupchat(m->conferences_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length);
1775 1774
1776 switch (ret) { 1775 switch (ret) {
1777 case -1: 1776 case -1:
@@ -1840,7 +1839,7 @@ bool tox_conference_send_message(Tox *tox, uint32_t conference_number, Tox_Messa
1840size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Title *error) 1839size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, Tox_Err_Conference_Title *error)
1841{ 1840{
1842 const Messenger *m = tox->m; 1841 const Messenger *m = tox->m;
1843 int ret = group_title_get_size(m->conferences_object, conference_number); 1842 const int ret = group_title_get_size(m->conferences_object, conference_number);
1844 1843
1845 switch (ret) { 1844 switch (ret) {
1846 case -1: 1845 case -1:
@@ -1860,7 +1859,7 @@ bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_
1860 Tox_Err_Conference_Title *error) 1859 Tox_Err_Conference_Title *error)
1861{ 1860{
1862 const Messenger *m = tox->m; 1861 const Messenger *m = tox->m;
1863 int ret = group_title_get(m->conferences_object, conference_number, title); 1862 const int ret = group_title_get(m->conferences_object, conference_number, title);
1864 1863
1865 switch (ret) { 1864 switch (ret) {
1866 case -1: 1865 case -1:
@@ -1880,7 +1879,7 @@ bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_
1880 Tox_Err_Conference_Title *error) 1879 Tox_Err_Conference_Title *error)
1881{ 1880{
1882 Messenger *m = tox->m; 1881 Messenger *m = tox->m;
1883 int ret = group_title_send(m->conferences_object, conference_number, title, length); 1882 const int ret = group_title_send(m->conferences_object, conference_number, title, length);
1884 1883
1885 switch (ret) { 1884 switch (ret) {
1886 case -1: 1885 case -1:
@@ -1909,7 +1908,7 @@ size_t tox_conference_get_chatlist_size(const Tox *tox)
1909void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist) 1908void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist)
1910{ 1909{
1911 const Messenger *m = tox->m; 1910 const Messenger *m = tox->m;
1912 size_t list_size = tox_conference_get_chatlist_size(tox); 1911 const size_t list_size = tox_conference_get_chatlist_size(tox);
1913 copy_chatlist(m->conferences_object, chatlist, list_size); 1912 copy_chatlist(m->conferences_object, chatlist, list_size);
1914} 1913}
1915 1914
@@ -1917,7 +1916,7 @@ Tox_Conference_Type tox_conference_get_type(const Tox *tox, uint32_t conference_
1917 Tox_Err_Conference_Get_Type *error) 1916 Tox_Err_Conference_Get_Type *error)
1918{ 1917{
1919 const Messenger *m = tox->m; 1918 const Messenger *m = tox->m;
1920 int ret = group_get_type(m->conferences_object, conference_number); 1919 const int ret = group_get_type(m->conferences_object, conference_number);
1921 1920
1922 if (ret == -1) { 1921 if (ret == -1) {
1923 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND); 1922 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
1946 return UINT32_MAX; 1945 return UINT32_MAX;
1947 } 1946 }
1948 1947
1949 int32_t ret = conference_by_id(tox->m->conferences_object, id); 1948 const int32_t ret = conference_by_id(tox->m->conferences_object, id);
1950 1949
1951 if (ret == -1) { 1950 if (ret == -1) {
1952 SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_BY_ID_NOT_FOUND); 1951 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_
2031 return 0; 2030 return 0;
2032 } 2031 }
2033 2032
2034 int ret = m_send_custom_lossy_packet(m, friend_number, data, length); 2033 const int ret = m_send_custom_lossy_packet(m, friend_number, data, length);
2035 2034
2036 set_custom_packet_error(ret, error); 2035 set_custom_packet_error(ret, error);
2037 2036
@@ -2062,7 +2061,7 @@ bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uin
2062 return 0; 2061 return 0;
2063 } 2062 }
2064 2063
2065 int ret = send_custom_lossless_packet(m, friend_number, data, length); 2064 const int ret = send_custom_lossless_packet(m, friend_number, data, length);
2066 2065
2067 set_custom_packet_error(ret, error); 2066 set_custom_packet_error(ret, error);
2068 2067
@@ -2089,7 +2088,7 @@ void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id)
2089uint16_t tox_self_get_udp_port(const Tox *tox, Tox_Err_Get_Port *error) 2088uint16_t tox_self_get_udp_port(const Tox *tox, Tox_Err_Get_Port *error)
2090{ 2089{
2091 const Messenger *m = tox->m; 2090 const Messenger *m = tox->m;
2092 uint16_t port = net_htons(net_port(m->net)); 2091 const uint16_t port = net_htons(net_port(m->net));
2093 2092
2094 if (port) { 2093 if (port) {
2095 SET_ERROR_PARAMETER(error, TOX_ERR_GET_PORT_OK); 2094 SET_ERROR_PARAMETER(error, TOX_ERR_GET_PORT_OK);