diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-10-08 21:05:14 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-10-09 17:33:37 +0000 |
commit | 605dfe882c52bfad4dee9678a69e4b816d93431d (patch) | |
tree | 10432adc5d3716cb28b833c6e156218b67c23494 /auto_tests/conference_peer_nick_test.c | |
parent | 77e025fae48a4f9cf6cf19a359b6c423545f3cc7 (diff) |
Consistently use camel case enum names.
Including in tests and implementation files.
Diffstat (limited to 'auto_tests/conference_peer_nick_test.c')
-rw-r--r-- | auto_tests/conference_peer_nick_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/auto_tests/conference_peer_nick_test.c b/auto_tests/conference_peer_nick_test.c index d8d2d64b..9d10a8a9 100644 --- a/auto_tests/conference_peer_nick_test.c +++ b/auto_tests/conference_peer_nick_test.c | |||
@@ -20,7 +20,7 @@ typedef struct State { | |||
20 | #include "run_auto_test.h" | 20 | #include "run_auto_test.h" |
21 | 21 | ||
22 | static void handle_conference_invite( | 22 | static void handle_conference_invite( |
23 | Tox *tox, uint32_t friend_number, TOX_CONFERENCE_TYPE type, | 23 | Tox *tox, uint32_t friend_number, Tox_Conference_Type type, |
24 | const uint8_t *cookie, size_t length, void *user_data) | 24 | const uint8_t *cookie, size_t length, void *user_data) |
25 | { | 25 | { |
26 | State *state = (State *)user_data; | 26 | State *state = (State *)user_data; |
@@ -29,7 +29,7 @@ static void handle_conference_invite( | |||
29 | state->index, friend_number, type, (unsigned)length); | 29 | state->index, friend_number, type, (unsigned)length); |
30 | fprintf(stderr, "tox%u joining conference\n", state->index); | 30 | fprintf(stderr, "tox%u joining conference\n", state->index); |
31 | 31 | ||
32 | TOX_ERR_CONFERENCE_JOIN err; | 32 | Tox_Err_Conference_Join err; |
33 | state->conference = tox_conference_join(tox, friend_number, cookie, length, &err); | 33 | state->conference = tox_conference_join(tox, friend_number, cookie, length, &err); |
34 | ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK, | 34 | ck_assert_msg(err == TOX_ERR_CONFERENCE_JOIN_OK, |
35 | "attempting to join the conference returned with an error: %d", err); | 35 | "attempting to join the conference returned with an error: %d", err); |
@@ -44,7 +44,7 @@ static void handle_peer_list_changed(Tox *tox, uint32_t conference_number, void | |||
44 | fprintf(stderr, "handle_peer_list_changed(#%u, %u, _)\n", | 44 | fprintf(stderr, "handle_peer_list_changed(#%u, %u, _)\n", |
45 | state->index, conference_number); | 45 | state->index, conference_number); |
46 | 46 | ||
47 | TOX_ERR_CONFERENCE_PEER_QUERY err; | 47 | Tox_Err_Conference_Peer_Query err; |
48 | uint32_t const count = tox_conference_peer_count(tox, conference_number, &err); | 48 | uint32_t const count = tox_conference_peer_count(tox, conference_number, &err); |
49 | ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK, | 49 | ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK, |
50 | "failed to get conference peer count: err = %d", err); | 50 | "failed to get conference peer count: err = %d", err); |
@@ -57,7 +57,7 @@ static void rebuild_peer_list(Tox *tox) | |||
57 | for (uint32_t conference_number = 0; | 57 | for (uint32_t conference_number = 0; |
58 | conference_number < tox_conference_get_chatlist_size(tox); | 58 | conference_number < tox_conference_get_chatlist_size(tox); |
59 | ++conference_number) { | 59 | ++conference_number) { |
60 | TOX_ERR_CONFERENCE_PEER_QUERY err; | 60 | Tox_Err_Conference_Peer_Query err; |
61 | uint32_t const count = tox_conference_peer_count(tox, conference_number, &err); | 61 | uint32_t const count = tox_conference_peer_count(tox, conference_number, &err); |
62 | ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK, | 62 | ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK, |
63 | "failed to get conference peer count for conference %u: err = %d", conference_number, err); | 63 | "failed to get conference peer count for conference %u: err = %d", conference_number, err); |
@@ -90,7 +90,7 @@ static void conference_peer_nick_test(Tox **toxes, State *state) | |||
90 | 90 | ||
91 | { | 91 | { |
92 | // Create new conference, tox0 is the founder. | 92 | // Create new conference, tox0 is the founder. |
93 | TOX_ERR_CONFERENCE_NEW err; | 93 | Tox_Err_Conference_New err; |
94 | state[0].conference = tox_conference_new(toxes[0], &err); | 94 | state[0].conference = tox_conference_new(toxes[0], &err); |
95 | state[0].joined = true; | 95 | state[0].joined = true; |
96 | ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK, | 96 | ck_assert_msg(err == TOX_ERR_CONFERENCE_NEW_OK, |
@@ -100,7 +100,7 @@ static void conference_peer_nick_test(Tox **toxes, State *state) | |||
100 | 100 | ||
101 | { | 101 | { |
102 | // Invite friend. | 102 | // Invite friend. |
103 | TOX_ERR_CONFERENCE_INVITE err; | 103 | Tox_Err_Conference_Invite err; |
104 | tox_conference_invite(toxes[0], 0, state[0].conference, &err); | 104 | tox_conference_invite(toxes[0], 0, state[0].conference, &err); |
105 | ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, | 105 | ck_assert_msg(err == TOX_ERR_CONFERENCE_INVITE_OK, |
106 | "attempting to invite a friend returned with an error: %d", err); | 106 | "attempting to invite a friend returned with an error: %d", err); |