diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-08-12 11:35:01 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-08-12 14:09:59 +0000 |
commit | d92c96e7832ae4c7f9c32eec0d2f7f661a65b73e (patch) | |
tree | f7577121b3463ad094493fbb0cf3601fbcb0f9dc /auto_tests | |
parent | f0f456398da65fc36837c0ab66b983a69b6f9e3e (diff) |
Fix a few warnings from clang.
Also remove the use of a VLA in a context where there can be unbounded
memory allocations.
Diffstat (limited to 'auto_tests')
-rw-r--r-- | auto_tests/conference_double_invite_test.c | 2 | ||||
-rw-r--r-- | auto_tests/conference_simple_test.c | 7 |
2 files changed, 5 insertions, 4 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) | |||
73 | fprintf(stderr, "Invitations accepted\n"); | 73 | fprintf(stderr, "Invitations accepted\n"); |
74 | 74 | ||
75 | // Invite one more time, resulting in friend -1 inviting tox1 (toxes[1]). | 75 | // Invite one more time, resulting in friend -1 inviting tox1 (toxes[1]). |
76 | tox_conference_invite(toxes[0], 0, state[0].conference, 0); | 76 | tox_conference_invite(toxes[0], 0, state[0].conference, nullptr); |
77 | 77 | ||
78 | tox_iterate(toxes[0], &state[0]); | 78 | tox_iterate(toxes[0], &state[0]); |
79 | tox_iterate(toxes[1], &state[1]); | 79 | 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 | |||
99 | return; | 99 | return; |
100 | } | 100 | } |
101 | 101 | ||
102 | TOX_ERR_CONFERENCE_INVITE err; | 102 | TOX_ERR_CONFERENCE_INVITE err_invite; |
103 | tox_conference_invite(tox, 1, state->conference, &err); | 103 | tox_conference_invite(tox, 1, state->conference, &err_invite); |
104 | ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, "tox2 failed to invite tox3: err = %d", err); | 104 | ck_assert_msg(err_invite == TOX_ERR_CONFERENCE_INVITE_OK, |
105 | "tox2 failed to invite tox3: err = %d", err_invite); | ||
105 | 106 | ||
106 | state->invited_next = true; | 107 | state->invited_next = true; |
107 | fprintf(stderr, "tox2 invited tox3\n"); | 108 | fprintf(stderr, "tox2 invited tox3\n"); |