Skip to content

Commit 5911606

Browse files
sudden6sudden6
committed
refactor: make Tox_Options opaque
1 parent 6d9bd44 commit 5911606

19 files changed

+222
-232
lines changed

‎auto_tests/conference_av_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ static void run_conference_tests(Tox **toxes, State *state)
329329

330330
for (uint32_t i = 0; i < NUM_AV_GROUP_TOX; ++i) {
331331
if (restarting[i]) {
332-
struct Tox_Options *const options = tox_options_new(nullptr);
332+
Tox_Options *const options = tox_options_new(nullptr);
333333
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
334334
tox_options_set_savedata_data(options, save[i], save_size[i]);
335335
toxes[i] = tox_new_log(options, nullptr, &state[i].index);

‎auto_tests/conference_invite_merge_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static void reload(Tox **toxes, State *state, uint32_t n)
8686
fprintf(stderr, "Reloading #%u\n", state[n].index);
8787
ck_assert(state[n].save_state != nullptr);
8888

89-
struct Tox_Options *const options = tox_options_new(nullptr);
89+
Tox_Options *const options = tox_options_new(nullptr);
9090
ck_assert(options != nullptr);
9191
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
9292
tox_options_set_savedata_data(options, state[n].save_state, state[n].save_size);

‎auto_tests/conference_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static void run_conference_tests(Tox **toxes, State *state)
245245

246246
for (uint32_t i = 0; i < NUM_GROUP_TOX; ++i) {
247247
if (restarting[i]) {
248-
struct Tox_Options *const options = tox_options_new(nullptr);
248+
Tox_Options *const options = tox_options_new(nullptr);
249249
ck_assert(options != nullptr);
250250
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
251251
tox_options_set_savedata_data(options, save[i], save_size[i]);

‎auto_tests/encryptsave_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static void test_save_friend(void)
7171
ck_assert_msg(ret, "failed to encrypted save: %d", error1);
7272
ck_assert_msg(tox_is_data_encrypted(enc_data), "magic number missing");
7373

74-
struct Tox_Options *options = tox_options_new(nullptr);
74+
Tox_Options *options = tox_options_new(nullptr);
7575
ck_assert(options != nullptr);
7676
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
7777
tox_options_set_savedata_data(options, enc_data, size2);

‎auto_tests/file_saving_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static const char *savefile = "./save";
2525

2626
static void save_data_encrypted(void)
2727
{
28-
struct Tox_Options *options = tox_options_new(nullptr);
28+
Tox_Options *options = tox_options_new(nullptr);
2929
Tox *t = tox_new_log(options, nullptr, nullptr);
3030
tox_options_free(options);
3131

@@ -79,7 +79,7 @@ static void load_data_decrypted(void)
7979
ck_assert_msg(tox_pass_decrypt(cipher, size, (const uint8_t *)pphrase, strlen(pphrase), clear, &derr),
8080
"Could not decrypt, error code %d.", derr);
8181

82-
struct Tox_Options *options = tox_options_new(nullptr);
82+
Tox_Options *options = tox_options_new(nullptr);
8383
ck_assert(options != nullptr);
8484

8585
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);

‎auto_tests/invalid_tcp_proxy_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main(void)
2020
{
2121
setvbuf(stdout, nullptr, _IONBF, 0);
2222

23-
struct Tox_Options *opts = tox_options_new(nullptr);
23+
Tox_Options *opts = tox_options_new(nullptr);
2424
tox_options_set_udp_enabled(opts, false);
2525
tox_options_set_proxy_type(opts, TOX_PROXY_TYPE_SOCKS5);
2626
tox_options_set_proxy_host(opts, "localhost");

‎auto_tests/invalid_udp_proxy_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int main(void)
2020
{
2121
setvbuf(stdout, nullptr, _IONBF, 0);
2222

23-
struct Tox_Options *opts = tox_options_new(nullptr);
23+
Tox_Options *opts = tox_options_new(nullptr);
2424
tox_options_set_udp_enabled(opts, true);
2525
tox_options_set_proxy_type(opts, TOX_PROXY_TYPE_SOCKS5);
2626
tox_options_set_proxy_host(opts, "localhost");

‎auto_tests/save_compatibility_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static uint8_t *read_save(const char *save_path, size_t *length)
6969

7070
static void test_save_compatibility(const char *save_path)
7171
{
72-
struct Tox_Options *options = tox_options_new(nullptr);
72+
Tox_Options *options = tox_options_new(nullptr);
7373
ck_assert(options != nullptr);
7474

7575
size_t size = 0;

‎auto_tests/save_friend_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int main(void)
111111
VLA(uint8_t, savedata, save_size);
112112
tox_get_savedata(tox1, savedata);
113113

114-
struct Tox_Options *const options = tox_options_new(nullptr);
114+
Tox_Options *const options = tox_options_new(nullptr);
115115
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
116116
tox_options_set_savedata_data(options, savedata, save_size);
117117

‎auto_tests/save_load_test.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static void tox_connection_status(Tox *tox, Tox_Connection connection_status, vo
5252
* b) a saved state can be loaded back successfully
5353
* c) a second save is of equal size
5454
* d) the second save is of equal content */
55-
static void reload_tox(Tox **tox, struct Tox_Options *const in_opts, void *user_data)
55+
static void reload_tox(Tox **tox, Tox_Options *const in_opts, void *user_data)
5656
{
5757
const size_t extra = 64;
5858
const size_t save_size1 = tox_get_savedata_size(*tox);
@@ -71,7 +71,7 @@ static void reload_tox(Tox **tox, struct Tox_Options *const in_opts, void *user_
7171
ck_assert_msg(buffer[extra + save_size1 + i] == 0xCD, "Buffer overwritten from tox_get_savedata() @%u", (unsigned)i);
7272
}
7373

74-
struct Tox_Options *const options = (in_opts == nullptr) ? tox_options_new(nullptr) : in_opts;
74+
Tox_Options *const options = (in_opts == nullptr) ? tox_options_new(nullptr) : in_opts;
7575

7676
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
7777

@@ -108,20 +108,20 @@ static void test_few_clients(void)
108108
uint32_t index[] = { 1, 2, 3 };
109109
time_t con_time = 0, cur_time = time(nullptr);
110110

111-
struct Tox_Options *opts1 = tox_options_new(nullptr);
111+
Tox_Options *opts1 = tox_options_new(nullptr);
112112
tox_options_set_tcp_port(opts1, TCP_RELAY_PORT);
113113
Tox_Err_New t_n_error;
114114
Tox *tox1 = tox_new_log(opts1, &t_n_error, &index[0]);
115115
ck_assert_msg(t_n_error == TOX_ERR_NEW_OK, "Failed to create tox instance: %d", t_n_error);
116116
tox_options_free(opts1);
117117

118-
struct Tox_Options *opts2 = tox_options_new(nullptr);
118+
Tox_Options *opts2 = tox_options_new(nullptr);
119119
tox_options_set_udp_enabled(opts2, false);
120120
tox_options_set_local_discovery_enabled(opts2, false);
121121
Tox *tox2 = tox_new_log(opts2, &t_n_error, &index[1]);
122122
ck_assert_msg(t_n_error == TOX_ERR_NEW_OK, "Failed to create tox instance: %d", t_n_error);
123123

124-
struct Tox_Options *opts3 = tox_options_new(nullptr);
124+
Tox_Options *opts3 = tox_options_new(nullptr);
125125
tox_options_set_local_discovery_enabled(opts3, false);
126126
Tox *tox3 = tox_new_log(opts3, &t_n_error, &index[2]);
127127
ck_assert_msg(t_n_error == TOX_ERR_NEW_OK, "Failed to create tox instance: %d", t_n_error);

‎auto_tests/tox_many_tcp_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ START_TEST(test_many_clients_tcp)
5050
uint32_t to_comp = 974536;
5151

5252
for (i = 0; i < NUM_TOXES_TCP; ++i) {
53-
struct Tox_Options *opts = tox_options_new(nullptr);
53+
Tox_Options *opts = tox_options_new(nullptr);
5454

5555
if (i == 0) {
5656
tox_options_set_tcp_port(opts, TCP_RELAY_PORT);
@@ -144,7 +144,7 @@ START_TEST(test_many_clients_tcp_b)
144144
uint32_t to_comp = 974536;
145145

146146
for (i = 0; i < NUM_TOXES_TCP; ++i) {
147-
struct Tox_Options *opts = tox_options_new(nullptr);
147+
Tox_Options *opts = tox_options_new(nullptr);
148148

149149
if (i < NUM_TCP_RELAYS) {
150150
tox_options_set_tcp_port(opts, TCP_RELAY_PORT + i);

‎auto_tests/tox_one_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void test_one(void)
8282
tox_kill(tox2);
8383
Tox_Err_New err_n;
8484

85-
struct Tox_Options *options = tox_options_new(nullptr);
85+
Tox_Options *options = tox_options_new(nullptr);
8686
ck_assert(options != nullptr);
8787
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
8888
tox_options_set_savedata_data(options, data, save_size);

‎testing/afl_toxsave.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
2929

3030
Tox_Err_Options_New error_options;
3131

32-
struct Tox_Options *tox_options = tox_options_new(&error_options);
32+
Tox_Options *tox_options = tox_options_new(&error_options);
3333

3434
if (error_options != TOX_ERR_OPTIONS_NEW_OK) {
3535
free(buffer);

‎testing/misc_tools.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t lin
174174
}
175175
}
176176

177-
Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery)
177+
Tox *tox_new_log_lan(Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery)
178178
{
179-
struct Tox_Options *log_options = options;
179+
Tox_Options *log_options = options;
180180

181181
if (log_options == nullptr) {
182182
log_options = tox_options_new(nullptr);
@@ -198,7 +198,7 @@ Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_us
198198
return tox;
199199
}
200200

201-
Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data)
201+
Tox *tox_new_log(Tox_Options *options, Tox_Err_New *err, void *log_user_data)
202202
{
203203
return tox_new_log_lan(options, err, log_user_data, false);
204204
}

‎testing/misc_tools.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ int cmdline_parsefor_ipv46(int argc, char **argv, bool *ipv6enabled);
2020
void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
2121
const char *message, void *user_data);
2222

23-
Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data);
24-
Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery);
23+
Tox *tox_new_log(Tox_Options *options, Tox_Err_New *err, void *log_user_data);
24+
Tox *tox_new_log_lan(Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery);
2525

2626
int use_test_rng(uint32_t seed);
2727

‎toxcore/tox.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ static int tox_load(Tox *tox, const uint8_t *data, uint32_t length)
373373
}
374374

375375

376-
Tox *tox_new(const struct Tox_Options *options, Tox_Err_New *error)
376+
Tox *tox_new(const Tox_Options *options, Tox_Err_New *error)
377377
{
378378
Tox *tox = (Tox *)calloc(1, sizeof(Tox));
379379

@@ -387,7 +387,7 @@ Tox *tox_new(const struct Tox_Options *options, Tox_Err_New *error)
387387
bool load_savedata_sk = false;
388388
bool load_savedata_tox = false;
389389

390-
struct Tox_Options *default_options = nullptr;
390+
Tox_Options *default_options = nullptr;
391391

392392
if (options == nullptr) {
393393
Tox_Err_Options_New err;
@@ -406,7 +406,7 @@ Tox *tox_new(const struct Tox_Options *options, Tox_Err_New *error)
406406
}
407407
}
408408

409-
const struct Tox_Options *const opts = options != nullptr ? options : default_options;
409+
const Tox_Options *const opts = options != nullptr ? options : default_options;
410410
assert(opts != nullptr);
411411

412412
if (tox_options_get_savedata_type(opts) != TOX_SAVEDATA_TYPE_NONE) {

0 commit comments

Comments
 (0)