Fix a bunch of compiler warnings and remove suppressions.

2 files changed, 6 insertions, 2 deletions

diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 50e0fa57..daf2d125 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -190,6 +190,7 @@ int main(int argc, char *argv[])
         FILE *file = fopen("Save.bak", "wb");
 
         if (file == nullptr) {
+            kill_messenger(m);
             return 1;
         }
 
@@ -198,12 +199,11 @@ int main(int argc, char *argv[])
         size_t write_result = fwrite(buffer, 1, messenger_size(m), file);
 
         if (write_result < messenger_size(m)) {
+            kill_messenger(m);
             return 1;
         }
 
         free(buffer);
         fclose(file);
     }
-
-    kill_messenger(m);
 }
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 14e0ba7e..3a6a3333 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -47,6 +47,10 @@
 
 #include "../toxcore/ccompat.h"
 
+uint8_t *hex_string_to_bin(const char *hex_string);
+int tox_strncasecmp(const char *s1, const char *s2, size_t n);
+int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
+
 // You are responsible for freeing the return value!
 uint8_t *hex_string_to_bin(const char *hex_string)
 {