Fix a few warnings from clang.

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

10 files changed, 28 insertions, 22 deletions

diff --git a/auto_tests/conference_double_invite_test.c b/auto_tests/conference_double_invite_test.c
index 55aabfb6..026c2fcb 100644
--- a/auto_tests/conference_double_invite_test.c
+++ b/auto_tests/conference_double_invite_test.c
@@ -73,7 +73,7 @@ static void conference_double_invite_test(Tox **toxes, State *state)
     fprintf(stderr, "Invitations accepted\n");
 
     // Invite one more time, resulting in friend -1 inviting tox1 (toxes[1]).
-    tox_conference_invite(toxes[0], 0, state[0].conference, 0);
+    tox_conference_invite(toxes[0], 0, state[0].conference, nullptr);
 
     tox_iterate(toxes[0], &state[0]);
     tox_iterate(toxes[1], &state[1]);
diff --git a/auto_tests/conference_simple_test.c b/auto_tests/conference_simple_test.c
index f2bede30..5a286b4a 100644
--- a/auto_tests/conference_simple_test.c
+++ b/auto_tests/conference_simple_test.c
@@ -99,9 +99,10 @@ static void handle_conference_peer_list_changed(Tox *tox, uint32_t conference_nu
             return;
         }
 
-        TOX_ERR_CONFERENCE_INVITE err;
-        tox_conference_invite(tox, 1, state->conference, &err);
-        ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox2 failed to invite tox3: err = %d", err);
+        TOX_ERR_CONFERENCE_INVITE err_invite;
+        tox_conference_invite(tox, 1, state->conference, &err_invite);
+        ck_assert_msg(err_invite == TOX_ERR_CONFERENCE_INVITE_OK,
+                      "tox2 failed to invite tox3: err = %d", err_invite);
 
         state->invited_next = true;
         fprintf(stderr, "tox2 invited tox3\n");
diff --git a/other/analysis/gen-file.sh b/other/analysis/gen-file.sh
index 8c320acf..019bd8f9 100644
--- a/other/analysis/gen-file.sh
+++ b/other/analysis/gen-file.sh
@@ -43,6 +43,7 @@ echo "#include <random>" >> amalgamation.cc
 put auto_tests/check_compat.h
 
 FIND_QUERY="find . '-(' -name '*.cc' -or -name '*.c' '-)'"
+FIND_QUERY="$FIND_QUERY -and -not -wholename './_build/*'"
 FIND_QUERY="$FIND_QUERY -and -not -wholename './super_donators/*'"
 FIND_QUERY="$FIND_QUERY -and -not -wholename './toxav/*.cc'"
 FIND_QUERY="$FIND_QUERY -and -not -wholename './toxcore/*.cc'"
diff --git a/other/bootstrap_daemon/src/command_line_arguments.c b/other/bootstrap_daemon/src/command_line_arguments.c
index d9747932..d76bc655 100644
--- a/other/bootstrap_daemon/src/command_line_arguments.c
+++ b/other/bootstrap_daemon/src/command_line_arguments.c
@@ -73,13 +73,13 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,
 
     opterr = 0;
 
-    static struct option long_options[] = {
-        {"config",      required_argument, 0, 'c'}, // required option
-        {"foreground",  no_argument,       0, 'f'},
-        {"help",        no_argument,       0, 'h'},
-        {"log-backend", required_argument, 0, 'l'}, // optional, defaults to syslog
-        {"version",     no_argument,       0, 'v'},
-        {0,             0,                 0,  0 }
+    static const struct option long_options[] = {
+        {"config",      required_argument, nullptr, 'c'}, // required option
+        {"foreground",  no_argument,       nullptr, 'f'},
+        {"help",        no_argument,       nullptr, 'h'},
+        {"log-backend", required_argument, nullptr, 'l'}, // optional, defaults to syslog
+        {"version",     no_argument,       nullptr, 'v'},
+        {nullptr,       0,                 nullptr,  0 }
     };
 
     bool cfg_file_path_set = false;
diff --git a/other/bootstrap_daemon/src/log.h b/other/bootstrap_daemon/src/log.h
index ab7cd30b..a810d997 100644
--- a/other/bootstrap_daemon/src/log.h
+++ b/other/bootstrap_daemon/src/log.h
@@ -27,6 +27,8 @@
 
 #include <stdbool.h>
 
+#include "../../../toxcore/ccompat.h"
+
 typedef enum LOG_BACKEND {
     LOG_BACKEND_STDOUT,
     LOG_BACKEND_SYSLOG
@@ -41,13 +43,13 @@ typedef enum LOG_LEVEL {
 /**
  * Initializes logger.
  * @param backend Specifies which backend to use.
- * @return true on success, flase if log is already opened.
+ * @return true on success, false if log is already opened.
  */
 bool log_open(LOG_BACKEND backend);
 
 /**
  * Releases all used resources by the logger.
- * @return true on success, flase if log is already closed.
+ * @return true on success, false if log is already closed.
  */
 bool log_close(void);
 
@@ -56,9 +58,9 @@ bool log_close(void);
  * @param level Log level to use.
  * @param format printf-like format string.
  * @param ... Zero or more arguments, similar to printf function.
- * @return true on success, flase if log is closed.
+ * @return true on success, false if log is closed.
  */
-bool log_write(LOG_LEVEL level, const char *format, ...);
+bool log_write(LOG_LEVEL level, const char *format, ...) GNU_PRINTF(2, 3);
 
 
 #endif // LOG_H
diff --git a/other/bootstrap_daemon/src/log_backend_stdout.h b/other/bootstrap_daemon/src/log_backend_stdout.h
index 5d8dd463..096af49c 100644
--- a/other/bootstrap_daemon/src/log_backend_stdout.h
+++ b/other/bootstrap_daemon/src/log_backend_stdout.h
@@ -29,6 +29,6 @@
 
 #include <stdarg.h>
 
-void log_backend_stdout_write(LOG_LEVEL level, const char *format, va_list args);
+void log_backend_stdout_write(LOG_LEVEL level, const char *format, va_list args) GNU_PRINTF(2, 0);
 
 #endif // LOG_BACKEND_STDOUT_H
diff --git a/other/bootstrap_daemon/src/log_backend_syslog.c b/other/bootstrap_daemon/src/log_backend_syslog.c
index 9fc6d18f..73ecc964 100644
--- a/other/bootstrap_daemon/src/log_backend_syslog.c
+++ b/other/bootstrap_daemon/src/log_backend_syslog.c
@@ -30,6 +30,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 
 void log_backend_syslog_open(void)
@@ -72,8 +73,9 @@ void log_backend_syslog_write(LOG_LEVEL level, const char *format, va_list args)
         return;
     }
 
-    VLA(char, buf, size + 1);
+    char *buf = (char *)malloc(size + 1);
     vsnprintf(buf, size + 1, format, args);
 
     syslog(log_backend_syslog_level(level), "%s", buf);
+    free(buf);
 }
diff --git a/other/bootstrap_daemon/src/log_backend_syslog.h b/other/bootstrap_daemon/src/log_backend_syslog.h
index f09b0431..5e9a3069 100644
--- a/other/bootstrap_daemon/src/log_backend_syslog.h
+++ b/other/bootstrap_daemon/src/log_backend_syslog.h
@@ -31,6 +31,6 @@
 
 void log_backend_syslog_open(void);
 void log_backend_syslog_close(void);
-void log_backend_syslog_write(LOG_LEVEL level, const char *format, va_list args);
+void log_backend_syslog_write(LOG_LEVEL level, const char *format, va_list args) GNU_PRINTF(2, 0);
 
 #endif // LOG_BACKEND_SYSLOG_H
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");