Use nullptr as NULL pointer constant instead of NULL or 0.

This changes only code, no string literals or comments.

8 files changed, 64 insertions, 56 deletions

diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index 3c8f8293..37141cbd 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -6,6 +6,7 @@ cc_library(
         "misc_tools.c",
     ],
     visibility = ["//c-toxcore:__subpackages__"],
+    deps = ["//c-toxcore/toxcore:ccompat"],
 )
 
 cc_binary(
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index c9d34238..c7db4092 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
     IP ip;
     ip_init(&ip, ipv6enabled);
 
-    DHT *dht = new_DHT(NULL, new_networking(NULL, ip, PORT), true);
+    DHT *dht = new_DHT(nullptr, new_networking(nullptr, ip, PORT), true);
     printf("OUR ID: ");
     uint32_t i;
 
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
         }
 
 #endif
-        networking_poll(dht_get_net(dht), NULL);
+        networking_poll(dht_get_net(dht), nullptr);
 
         print_clientlist(dht);
         print_friendlist(dht);
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 8d0c8515..50e0fa57 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
     } else {
         FILE *file = fopen(argv[argvoffset + 1], "rb");
 
-        if (file == NULL) {
+        if (file == nullptr) {
             printf("Failed to open \"%s\" - does it exist?\n", argv[argvoffset + 1]);
             return 1;
         }
@@ -185,11 +185,11 @@ int main(int argc, char *argv[])
         printf("%s\n", name);
 
         m_send_message_generic(m, num, MESSAGE_NORMAL, (const uint8_t *)"Test", 5, 0);
-        do_messenger(m, NULL);
+        do_messenger(m, nullptr);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");
 
-        if (file == NULL) {
+        if (file == nullptr) {
             return 1;
         }
 
diff --git a/testing/av_test.c b/testing/av_test.c
index ce982e32..0d61edec 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -111,7 +111,7 @@ struct toxav_thread_data {
 };
 
 static const char *vdout = "AV Test"; /* Video output */
-static PaStream *adout = NULL; /* Audio output */
+static PaStream *adout = nullptr; /* Audio output */
 
 typedef struct {
     uint16_t size;
@@ -139,7 +139,7 @@ static void *pa_write_thread(void *d)
         }
     }
 
-    return NULL;
+    return nullptr;
 }
 
 /**
@@ -224,7 +224,7 @@ static void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const
                                        void *userdata)
 {
     if (length == 7 && memcmp("gentoo", data, 7) == 0) {
-        assert(tox_friend_add_norequest(m, public_key, NULL) != (uint32_t) ~0);
+        assert(tox_friend_add_norequest(m, public_key, nullptr) != (uint32_t) ~0);
     }
 }
 
@@ -235,8 +235,8 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
     Tox *Alice;
     Tox *Bob;
 
-    struct Tox_Options *opts = tox_options_new(NULL);
-    assert(opts != NULL);
+    struct Tox_Options *opts = tox_options_new(nullptr);
+    assert(opts != nullptr);
 
     tox_options_set_end_port(opts, 0);
     tox_options_set_ipv6_enabled(opts, false);
@@ -261,7 +261,7 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
 
     printf("Created 3 instances of Tox\n");
     printf("Preparing network...\n");
-    long long unsigned int cur_time = time(NULL);
+    long long unsigned int cur_time = time(nullptr);
 
     uint32_t to_compare = 974536;
     uint8_t address[TOX_ADDRESS_SIZE];
@@ -270,7 +270,7 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
     tox_self_get_address(Alice, address);
 
 
-    assert(tox_friend_add(Bob, address, (const uint8_t *)"gentoo", 7, NULL) != (uint32_t) ~0);
+    assert(tox_friend_add(Bob, address, (const uint8_t *)"gentoo", 7, nullptr) != (uint32_t) ~0);
 
     uint8_t off = 1;
 
@@ -282,12 +282,12 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
         if (tox_self_get_connection_status(*bootstrap) &&
                 tox_self_get_connection_status(Alice) &&
                 tox_self_get_connection_status(Bob) && off) {
-            printf("Toxes are online, took %llu seconds\n", time(NULL) - cur_time);
+            printf("Toxes are online, took %llu seconds\n", time(nullptr) - cur_time);
             off = 0;
         }
 
-        if (tox_friend_get_connection_status(Alice, 0, NULL) == TOX_CONNECTION_UDP &&
-                tox_friend_get_connection_status(Bob, 0, NULL) == TOX_CONNECTION_UDP) {
+        if (tox_friend_get_connection_status(Alice, 0, nullptr) == TOX_CONNECTION_UDP &&
+                tox_friend_get_connection_status(Bob, 0, nullptr) == TOX_CONNECTION_UDP) {
             break;
         }
 
@@ -321,7 +321,7 @@ static void initialize_tox(Tox **bootstrap, ToxAV **AliceAV, CallControl *AliceC
 
 
     printf("Created 2 instances of ToxAV\n");
-    printf("All set after %llu seconds!\n", time(NULL) - cur_time);
+    printf("All set after %llu seconds!\n", time(nullptr) - cur_time);
 }
 static int iterate_tox(Tox *bootstrap, ToxAV *AliceAV, ToxAV *BobAV, void *userdata)
 {
@@ -364,7 +364,7 @@ static void *iterate_toxav(void *data)
     cvDestroyWindow(vdout);
 #endif
 
-    pthread_exit(NULL);
+    pthread_exit(nullptr);
 }
 
 static int send_opencv_img(ToxAV *av, uint32_t friend_number, const IplImage *img)
@@ -399,7 +399,7 @@ static int send_opencv_img(ToxAV *av, uint32_t friend_number, const IplImage *im
     }
 
     int rc = toxav_video_send_frame(av, friend_number, img->width, img->height,
-                                    planes[0], planes[1], planes[2], NULL);
+                                    planes[0], planes[1], planes[2], nullptr);
     free(planes[0]);
     free(planes[1]);
     free(planes[2]);
@@ -441,8 +441,8 @@ int main(int argc, char **argv)
     struct stat st;
 
     /* AV files for testing */
-    const char *af_name = NULL;
-    const char *vf_name = NULL;
+    const char *af_name = nullptr;
+    const char *vf_name = nullptr;
     long audio_out_dev_idx = -1;
 
     int32_t audio_frame_duration = 20;
@@ -574,8 +574,8 @@ CHECK_ARG:
         memset(&AliceCC, 0, sizeof(CallControl));
         memset(&BobCC, 0, sizeof(CallControl));
 
-        pthread_mutex_init(AliceCC.arb_mutex, NULL);
-        pthread_mutex_init(BobCC.arb_mutex, NULL);
+        pthread_mutex_init(AliceCC.arb_mutex, nullptr);
+        pthread_mutex_init(BobCC.arb_mutex, nullptr);
 
         AliceCC.arb = rb_new(16);
         BobCC.arb = rb_new(16);
@@ -591,7 +591,7 @@ CHECK_ARG:
         }
 
         while (!BobCC.incoming) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
         }
 
         { /* Answer */
@@ -605,20 +605,20 @@ CHECK_ARG:
         }
 
         while (AliceCC.state == 0) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
         }
 
         /* Open audio file */
         af_handle = sf_open(af_name, SFM_READ, &af_info);
 
-        if (af_handle == NULL) {
+        if (af_handle == nullptr) {
             printf("Failed to open the file.\n");
             exit(1);
         }
 
         int16_t PCM[5760];
 
-        time_t start_time = time(NULL);
+        time_t start_time = time(nullptr);
         time_t expected_time = af_info.frames / af_info.samplerate + 2;
 
 
@@ -630,7 +630,7 @@ CHECK_ARG:
         };
 
         pthread_t dect;
-        pthread_create(&dect, NULL, iterate_toxav, &data);
+        pthread_create(&dect, nullptr, iterate_toxav, &data);
         pthread_detach(dect);
 
         int frame_size = (af_info.samplerate * audio_frame_duration / 1000) * af_info.channels;
@@ -640,24 +640,24 @@ CHECK_ARG:
         output.channelCount = af_info.channels;
         output.sampleFormat = paInt16;
         output.suggestedLatency = audio_dev->defaultHighOutputLatency;
-        output.hostApiSpecificStreamInfo = NULL;
+        output.hostApiSpecificStreamInfo = nullptr;
 
-        PaError err = Pa_OpenStream(&adout, NULL, &output, af_info.samplerate, frame_size, paNoFlag, NULL, NULL);
+        PaError err = Pa_OpenStream(&adout, nullptr, &output, af_info.samplerate, frame_size, paNoFlag, nullptr, nullptr);
         assert(err == paNoError);
 
         err = Pa_StartStream(adout);
         assert(err == paNoError);
 
-//         toxav_audio_bit_rate_set(AliceAV, 0, 64, false, NULL);
+//         toxav_audio_bit_rate_set(AliceAV, 0, 64, false, nullptr);
 
         /* Start write thread */
         pthread_t t;
-        pthread_create(&t, NULL, pa_write_thread, &BobCC);
+        pthread_create(&t, nullptr, pa_write_thread, &BobCC);
         pthread_detach(t);
 
         printf("Sample rate %d\n", af_info.samplerate);
 
-        while (start_time + expected_time > time(NULL)) {
+        while (start_time + expected_time > time(nullptr)) {
             uint64_t enc_start_time = current_time_monotonic();
             int64_t count = sf_read_short(af_handle, PCM, frame_size);
 
@@ -670,11 +670,11 @@ CHECK_ARG:
                 }
             }
 
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
             c_sleep((audio_frame_duration - (current_time_monotonic() - enc_start_time) - 1));
         }
 
-        printf("Played file in: %lu; stopping stream...\n", time(NULL) - start_time);
+        printf("Played file in: %lu; stopping stream...\n", time(nullptr) - start_time);
 
         Pa_StopStream(adout);
         sf_close(af_handle);
@@ -689,7 +689,7 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
         assert(BobCC.state == TOXAV_FRIEND_CALL_STATE_FINISHED);
 
         /* Stop decode thread */
@@ -702,7 +702,7 @@ CHECK_ARG:
         pthread_mutex_destroy(AliceCC.arb_mutex);
         pthread_mutex_destroy(BobCC.arb_mutex);
 
-        void *f = NULL;
+        void *f = nullptr;
 
         while (rb_read(AliceCC.arb, &f)) {
             free(f);
@@ -732,7 +732,7 @@ CHECK_ARG:
         }
 
         while (!BobCC.incoming) {
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
         }
 
         { /* Answer */
@@ -745,7 +745,7 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
 
         /* Start decode thread */
         struct toxav_thread_data data = {
@@ -755,7 +755,7 @@ CHECK_ARG:
         };
 
         pthread_t dect;
-        pthread_create(&dect, NULL, iterate_toxav, &data);
+        pthread_create(&dect, nullptr, iterate_toxav, &data);
         pthread_detach(dect);
 
         CvCapture *capture = cvCreateFileCapture(vf_name);
@@ -766,12 +766,12 @@ CHECK_ARG:
         }
 
 #if 0
-        toxav_video_bit_rate_set(AliceAV, 0, 5000, false, NULL);
+        toxav_video_bit_rate_set(AliceAV, 0, 5000, false, nullptr);
 #endif
 
-        time_t start_time = time(NULL);
+        time_t start_time = time(nullptr);
 
-        while (start_time + 90 > time(NULL)) {
+        while (start_time + 90 > time(nullptr)) {
             IplImage *frame = cvQueryFrame(capture);
 
             if (!frame) {
@@ -779,7 +779,7 @@ CHECK_ARG:
             }
 
             send_opencv_img(AliceAV, 0, frame);
-            iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+            iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
             c_sleep(10);
         }
 
@@ -795,7 +795,7 @@ CHECK_ARG:
             }
         }
 
-        iterate_tox(bootstrap, AliceAV, BobAV, NULL);
+        iterate_tox(bootstrap, AliceAV, BobAV, nullptr);
         assert(BobCC.state == TOXAV_FRIEND_CALL_STATE_FINISHED);
 
         /* Stop decode thread */
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index 83b86a19..329dfb85 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -94,7 +94,7 @@ static void callback_group_invite(Tox *tox, uint32_t fid, TOX_CONFERENCE_TYPE ty
                                   void *userdata)
 {
     if (current_group == -1) {
-        current_group = tox_conference_join(tox, fid, data, length, NULL);
+        current_group = tox_conference_join(tox, fid, data, length, nullptr);
     }
 }
 
@@ -103,13 +103,13 @@ static void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE typ
                                     void *userdata)
 {
     if (length == 1 && *message == 'c') {
-        if (tox_conference_delete(tox, current_group, NULL) == 0) {
+        if (tox_conference_delete(tox, current_group, nullptr) == 0) {
             current_group = -1;
         }
     }
 
     if (length == 1 && *message == 'i') {
-        tox_conference_invite(tox, fid, current_group, NULL);
+        tox_conference_invite(tox, fid, current_group, nullptr);
     }
 
     if (length == 1 && *message == 'j' && sock >= 0) {
@@ -121,14 +121,14 @@ static void copy_groupmessage(Tox *tox, uint32_t groupnumber, uint32_t friendgro
                               const uint8_t *message, size_t length,
                               void *userdata)
 {
-    if (tox_conference_peer_number_is_ours(tox, groupnumber, friendgroupnumber, NULL)) {
+    if (tox_conference_peer_number_is_ours(tox, groupnumber, friendgroupnumber, nullptr)) {
         return;
     }
 
     TOX_ERR_CONFERENCE_PEER_QUERY error;
     size_t namelen = tox_conference_peer_get_name_size(tox, groupnumber, friendgroupnumber, &error);
     uint8_t name[TOX_MAX_NAME_LENGTH];
-    tox_conference_peer_get_name(tox, groupnumber, friendgroupnumber, name, NULL);
+    tox_conference_peer_get_name(tox, groupnumber, friendgroupnumber, name, nullptr);
 
     if (namelen == 0 || error != TOX_ERR_CONFERENCE_PEER_QUERY_OK) {
         memcpy(name, "<unknown>", 9);
@@ -205,7 +205,7 @@ static void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 
     uint8_t *pmsg = (uint8_t *)strstr((char *)req, " PRIVMSG");
 
-    if (pmsg == NULL) {
+    if (pmsg == nullptr) {
         return;
     }
 
@@ -227,7 +227,7 @@ static void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 
     memcpy(message + length, msg + req_len + 2, len - (req_len + 2));
     length += len - (req_len + 2);
-    tox_conference_send_message(tox, current_group, TOX_MESSAGE_TYPE_NORMAL, message, length, NULL);
+    tox_conference_send_message(tox, current_group, TOX_MESSAGE_TYPE_NORMAL, message, length, nullptr);
 }
 
 static Tox *init_tox(int argc, char *argv[])
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        tox_iterate(tox, NULL);
+        tox_iterate(tox, nullptr);
         usleep(1000 * 50);
     }
 }
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index a3a89c2f..14e0ba7e 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -21,6 +21,9 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
+#ifndef MISC_TOOLS_C
+#define MISC_TOOLS_C
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -42,6 +45,8 @@
 #endif
 #endif
 
+#include "../toxcore/ccompat.h"
+
 // You are responsible for freeing the return value!
 uint8_t *hex_string_to_bin(const char *hex_string)
 {
@@ -111,3 +116,5 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
 
     return argvoffset;
 }
+
+#endif // MISC_TOOLS_C
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index 43e0b544..d0f38e24 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     }
 
     int *master = (int *)malloc(sizeof(int));
-    int ret = forkpty(master, NULL, NULL, NULL);
+    int ret = forkpty(master, nullptr, nullptr, nullptr);
 
     if (ret == -1) {
         printf("fork failed\n");
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     }
 
     if (ret == 0) {
-        execl("/bin/sh", "sh", NULL);
+        execl("/bin/sh", "sh", nullptr);
         return 0;
     }
 
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index 954c64e1..382e49f9 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
             d = opendir(path);
 
             if (d) {
-                while ((dir = readdir(d)) != NULL) {
+                while ((dir = readdir(d)) != nullptr) {
                     VLA(char, filepath, strlen(path) + strlen(dir->d_name) + 1);
                     memcpy(filepath, path, strlen(path));
                     memcpy(filepath + strlen(path), dir->d_name, strlen(dir->d_name) + 1);
@@ -338,7 +338,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        tox_iterate(tox, NULL);
+        tox_iterate(tox, nullptr);
         c_sleep(1);
     }
 }