|
@@ -121,7 +121,7 @@ test_options_validate_impl(const char *configuration,
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
- r = config_assign(&options_format, opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ r = config_assign(&options_format, opt, cl, 0, &msg);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
r = options_validate(NULL, opt, dflt, 0, &msg);
|
|
r = options_validate(NULL, opt, dflt, 0, &msg);
|
|
@@ -223,7 +223,7 @@ test_have_enough_mem_for_dircache(void *arg)
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
- r = config_assign(&options_format, opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ r = config_assign(&options_format, opt, cl, 0, &msg);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
/* 300 MB RAM available, DirCache enabled */
|
|
/* 300 MB RAM available, DirCache enabled */
|
|
@@ -246,7 +246,7 @@ test_have_enough_mem_for_dircache(void *arg)
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
- r = config_assign(&options_format, opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ r = config_assign(&options_format, opt, cl, 0, &msg);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
/* 300 MB RAM available, DirCache enabled, Bridge */
|
|
/* 300 MB RAM available, DirCache enabled, Bridge */
|
|
@@ -269,7 +269,7 @@ test_have_enough_mem_for_dircache(void *arg)
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
r = config_get_lines(configuration, &cl, 1);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
- r = config_assign(&options_format, opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ r = config_assign(&options_format, opt, cl, 0, &msg);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
tt_int_op(r, OP_EQ, 0);
|
|
|
|
|
|
/* 200 MB RAM available, DirCache disabled */
|
|
/* 200 MB RAM available, DirCache disabled */
|
|
@@ -354,7 +354,7 @@ get_options_test_data(const char *conf)
|
|
result->def_opt = options_new();
|
|
result->def_opt = options_new();
|
|
rv = config_get_lines(conf, &cl, 1);
|
|
rv = config_get_lines(conf, &cl, 1);
|
|
tt_assert(rv == 0);
|
|
tt_assert(rv == 0);
|
|
- rv = config_assign(&options_format, result->opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ rv = config_assign(&options_format, result->opt, cl, 0, &msg);
|
|
if (msg) {
|
|
if (msg) {
|
|
/* Display the parse error message by comparing it with an empty string */
|
|
/* Display the parse error message by comparing it with an empty string */
|
|
tt_str_op(msg, OP_EQ, "");
|
|
tt_str_op(msg, OP_EQ, "");
|
|
@@ -365,7 +365,7 @@ get_options_test_data(const char *conf)
|
|
result->opt->TokenBucketRefillInterval = 1;
|
|
result->opt->TokenBucketRefillInterval = 1;
|
|
rv = config_get_lines(TEST_OPTIONS_OLD_VALUES, &cl, 1);
|
|
rv = config_get_lines(TEST_OPTIONS_OLD_VALUES, &cl, 1);
|
|
tt_assert(rv == 0);
|
|
tt_assert(rv == 0);
|
|
- rv = config_assign(&options_format, result->def_opt, cl, 0, 0, &msg);
|
|
|
|
|
|
+ rv = config_assign(&options_format, result->def_opt, cl, 0, &msg);
|
|
if (msg) {
|
|
if (msg) {
|
|
/* Display the parse error message by comparing it with an empty string */
|
|
/* Display the parse error message by comparing it with an empty string */
|
|
tt_str_op(msg, OP_EQ, "");
|
|
tt_str_op(msg, OP_EQ, "");
|