Fix a few warnings from clang.

Also remove the use of a VLA in a context where there can be unbounded
memory allocations.

2 files changed, 4 insertions, 4 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 78853746..c9372847 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
     }
 
     uint8_t *bin_id = hex_string_to_bin(temp_id);
-    dht_addfriend(dht, bin_id, 0, 0, 0, 0);
+    dht_addfriend(dht, bin_id, nullptr, nullptr, 0, nullptr);
     free(bin_id);
 
     perror("Initialization");
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index a3380a09..4c140da9 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -53,7 +53,7 @@ static void print_message(Messenger *m, uint32_t friendnumber, unsigned int type
                           void *userdata)
 {
     printf("Message with length %u received from %u: %s \n", (unsigned)length, friendnumber, string);
-    m_send_message_generic(m, friendnumber, type, (const uint8_t *)"Test1", 6, 0);
+    m_send_message_generic(m, friendnumber, type, (const uint8_t *)"Test1", 6, nullptr);
 }
 
 /* TODO(irungentoo): needed as print_request has to match the interface expected by
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     Messenger_Options options = {0};
     options.ipv6enabled = ipv6enabled;
-    m = new_messenger(&options, 0);
+    m = new_messenger(&options, nullptr);
 
     if (!m) {
         fputs("Failed to allocate messenger datastructure\n", stderr);
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
         getname(m, num, name);
         printf("%s\n", name);
 
-        m_send_message_generic(m, num, MESSAGE_NORMAL, (const uint8_t *)"Test", 5, 0);
+        m_send_message_generic(m, num, MESSAGE_NORMAL, (const uint8_t *)"Test", 5, nullptr);
         do_messenger(m, nullptr);
         c_sleep(30);
         FILE *file = fopen("Save.bak", "wb");