Move log callback to options.

Previously, all log messages generated by tox_new (which is quite a lot)
were dropped, because client code had no chance to register a logging
callback, yet. This change allows setting the log callback from the
beginning and removes the ability to unset it.

Since the log callback is forever special, since it can't be stateless,
we don't necessarily need to treat it uniformly (with `event`).

1 files changed, 7 insertions, 25 deletions

diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 6f864f07..a351129a 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -2,15 +2,7 @@
 #include "config.h"
 #endif
 
-#ifndef HAVE_LIBCHECK
-#   include <assert.h>
-
-#   define ck_assert(X) assert(X);
-#   define START_TEST(NAME) static void NAME (void)
-#   define END_TEST
-#else
-#   include "helpers.h"
-#endif
+#include "helpers.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -207,6 +199,7 @@ static void *call_thread(void *pd)
 
 START_TEST(test_AV_three_calls)
 {
+    uint32_t index[] = { 1, 2, 3, 4, 5 };
     Tox *Alice, *bootstrap, *Bobs[3];
     ToxAV *AliceAV, *BobsAV[3];
 
@@ -215,19 +208,19 @@ START_TEST(test_AV_three_calls)
     {
         TOX_ERR_NEW error;
 
-        bootstrap = tox_new(NULL, &error);
+        bootstrap = tox_new_log(NULL, &error, &index[0]);
         ck_assert(error == TOX_ERR_NEW_OK);
 
-        Alice = tox_new(NULL, &error);
+        Alice = tox_new_log(NULL, &error, &index[1]);
         ck_assert(error == TOX_ERR_NEW_OK);
 
-        Bobs[0] = tox_new(NULL, &error);
+        Bobs[0] = tox_new_log(NULL, &error, &index[2]);
         ck_assert(error == TOX_ERR_NEW_OK);
 
-        Bobs[1] = tox_new(NULL, &error);
+        Bobs[1] = tox_new_log(NULL, &error, &index[3]);
         ck_assert(error == TOX_ERR_NEW_OK);
 
-        Bobs[2] = tox_new(NULL, &error);
+        Bobs[2] = tox_new_log(NULL, &error, &index[4]);
         ck_assert(error == TOX_ERR_NEW_OK);
     }
 
@@ -341,16 +334,6 @@ START_TEST(test_AV_three_calls)
 END_TEST
 
 
-#ifndef HAVE_LIBCHECK
-int main(int argc, char *argv[])
-{
-    (void) argc;
-    (void) argv;
-
-    test_AV_three_calls();
-    return 0;
-}
-#else
 static Suite *tox_suite(void)
 {
     Suite *s = suite_create("ToxAV");
@@ -380,4 +363,3 @@ int main(int argc, char *argv[])
 
     return number_failed;
 }
-#endif