Make toxcore code C++ compatible.

It is still C code, so still compatible with C compilers as well. This
change lets us see more clearly where implicit conversions occur by
making them explicit.

5 files changed, 24 insertions, 19 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 05f42a6a..1442dcae 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -132,7 +132,7 @@ struct sec_TCP_con {
 
 static struct sec_TCP_con *new_TCP_con(TCP_Server *tcp_s)
 {
-    struct sec_TCP_con *sec_c = malloc(sizeof(struct sec_TCP_con));
+    struct sec_TCP_con *sec_c = (struct sec_TCP_con *)malloc(sizeof(struct sec_TCP_con));
     sock_t sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
     struct sockaddr_in6 addr6_loopback = {0};
     addr6_loopback.sin6_family = AF_INET6;
@@ -636,6 +636,8 @@ static bool tcp_oobdata_callback_called;
 static int tcp_oobdata_callback(void *object, const uint8_t *public_key, unsigned int id, const uint8_t *data,
                                 uint16_t length, void *userdata)
 {
+    TCP_Connections *tcp_c = (TCP_Connections *)object;
+
     if (length != 6) {
         return -1;
     }
@@ -644,7 +646,7 @@ static int tcp_oobdata_callback(void *object, const uint8_t *public_key, unsigne
         return -1;
     }
 
-    if (tcp_send_oob_packet(object, id, public_key, data, length) == 0) {
+    if (tcp_send_oob_packet(tcp_c, id, public_key, data, length) == 0) {
         tcp_oobdata_callback_called = 1;
     }
 
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 08044637..7b22e515 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -528,11 +528,14 @@ static void test_list_main(void)
                 }
 
                 ck_assert_msg(count == 1, "Nodes in search don't know ip of friend. %u %u %u", i, j, count);
-                /*
-                            for (k = 0; k < MAX_SENT_NODES; ++k) {
-                                printf("----gn %u----\n", k);
-                                print_pk(ln[k].public_key);
-                            }*/
+#if 0
+
+                for (k = 0; k < MAX_SENT_NODES; ++k) {
+                    printf("----gn %u----\n", k);
+                    print_pk(ln[k].public_key);
+                }
+
+#endif
                 ++m_count;
             }
         }
@@ -542,7 +545,7 @@ static void test_list_main(void)
                   (NUM_DHT) * (MAX_FRIEND_CLIENTS));
 
     for (i = 0; i < NUM_DHT; ++i) {
-        void *n = dhts[i]->net;
+        Networking_Core *n = dhts[i]->net;
         kill_DHT(dhts[i]);
         kill_networking(n);
     }
@@ -643,7 +646,7 @@ loop_top:
     }
 
     for (i = 0; i < NUM_DHT; ++i) {
-        void *n = dhts[i]->net;
+        Networking_Core *n = dhts[i]->net;
         kill_DHT(dhts[i]);
         kill_networking(n);
     }
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 6e330091..ee9df7a0 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -32,7 +32,7 @@ static void do_onion(Onion *onion)
 static int handled_test_1;
 static int handle_test_1(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata)
 {
-    Onion *onion = object;
+    Onion *onion = (Onion *)object;
 
     if (memcmp(packet, "Install Gentoo", sizeof("Install Gentoo")) != 0) {
         return 1;
@@ -79,7 +79,7 @@ static uint8_t test_3_pub_key[crypto_box_PUBLICKEYBYTES];
 static uint8_t test_3_ping_id[crypto_hash_sha256_BYTES];
 static int handle_test_3(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata)
 {
-    Onion *onion = object;
+    Onion *onion = (Onion *)object;
 
     if (length != (1 + crypto_box_NONCEBYTES + ONION_ANNOUNCE_SENDBACK_DATA_LENGTH + 1 + crypto_hash_sha256_BYTES +
                    crypto_box_MACBYTES)) {
@@ -111,7 +111,7 @@ static uint8_t nonce[crypto_box_NONCEBYTES];
 static int handled_test_4;
 static int handle_test_4(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata)
 {
-    Onion *onion = object;
+    Onion *onion = (Onion *)object;
 
     if (length != (1 + crypto_box_NONCEBYTES + crypto_box_PUBLICKEYBYTES + sizeof("Install gentoo") +
                    crypto_box_MACBYTES)) {
@@ -284,7 +284,7 @@ static Onions *new_onions(uint16_t port)
     IP ip;
     ip_init(&ip, 1);
     ip.ip6.uint8[15] = 1;
-    Onions *on = malloc(sizeof(Onions));
+    Onions *on = (Onions *)malloc(sizeof(Onions));
     DHT *dht = new_DHT(NULL, new_networking(NULL, ip, port));
     on->onion = new_onion(dht);
     on->onion_a = new_onion_announce(dht);
@@ -346,7 +346,7 @@ static uint8_t last_dht_pk[crypto_box_PUBLICKEYBYTES];
 static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_public_key, void *userdata)
 {
     if ((NUM_FIRST == number && !first) || (NUM_LAST == number && !last)) {
-        Onions *on = object;
+        Onions *on = (Onions *)object;
         uint16_t count = 0;
         int ret = DHT_addfriend(on->onion->dht, dht_public_key, &dht_ip_callback, object, number, &count);
         ck_assert_msg(ret == 0, "DHT_addfriend() did not return 0");
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index a5745fe8..6ab03365 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -974,7 +974,7 @@ START_TEST(test_many_clients_tcp)
         tox_callback_friend_request(toxes[i], accept_friend_request);
         uint8_t dpk[TOX_PUBLIC_KEY_SIZE];
         tox_self_get_dht_id(toxes[0], dpk);
-        TOX_ERR_BOOTSTRAP error = 0;
+        TOX_ERR_BOOTSTRAP error = TOX_ERR_BOOTSTRAP_OK;
         ck_assert_msg(tox_add_tcp_relay(toxes[i], TOX_LOCALHOST, TCP_RELAY_PORT, dpk, &error), "add relay error, %i, %i", i,
                       error);
         ck_assert_msg(tox_bootstrap(toxes[i], TOX_LOCALHOST, 33445, dpk, 0), "Bootstrap error");
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index fec2a1de..6f864f07 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -164,10 +164,10 @@ static void *call_thread(void *pd)
 
     c_sleep(30);
 
-    int16_t *PCM = calloc(960, sizeof(int16_t));
-    uint8_t *video_y = calloc(800 * 600, sizeof(uint8_t));
-    uint8_t *video_u = calloc(800 * 600 / 4, sizeof(uint8_t));
-    uint8_t *video_v = calloc(800 * 600 / 4, sizeof(uint8_t));
+    int16_t *PCM = (int16_t *)calloc(960, sizeof(int16_t));
+    uint8_t *video_y = (uint8_t *)calloc(800 * 600, sizeof(uint8_t));
+    uint8_t *video_u = (uint8_t *)calloc(800 * 600 / 4, sizeof(uint8_t));
+    uint8_t *video_v = (uint8_t *)calloc(800 * 600 / 4, sizeof(uint8_t));
 
     time_t start_time = time(NULL);