nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

test_options: remove "dflt" part of setup_options().

Browse Source 
It is no longer used anywhere.
This commit is contained in:
Nick Mathewson 2019-10-22 14:07:32 -04:00
parent 475a1dc9be
commit 86a1d670ac
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/test_options.c
View File

@ -92,14 +92,11 @@ clear_log_messages(void)
messages = NULL; messages = NULL;
} }
#define setup_options(opt,dflt) \ #define setup_options(opt) \
do { \ do { \
opt = options_new(); \ opt = options_new(); \
opt->command = CMD_RUN_TOR; \ opt->command = CMD_RUN_TOR; \
options_init(opt); \ options_init(opt); \
\
dflt = config_dup(get_options_mgr(), opt); \
clear_log_messages(); \
} while (0) } while (0)
#define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \ #define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \
@ -181,12 +178,11 @@ test_options_validate_impl(const char *configuration,
int phase) int phase)
{ {
or_options_t *opt=NULL; or_options_t *opt=NULL;
or_options_t *dflt;
config_line_t *cl=NULL; config_line_t *cl=NULL;
char *msg=NULL; char *msg=NULL;
int r; int r;
setup_options(opt, dflt); setup_options(opt);
r = config_get_lines(configuration, &cl, 1); r = config_get_lines(configuration, &cl, 1);
if (phase == PH_GETLINES) { if (phase == PH_GETLINES) {
@ -223,7 +219,6 @@ test_options_validate_impl(const char *configuration,
policies_free_all(); policies_free_all();
config_free_lines(cl); config_free_lines(cl);
or_options_free(opt); or_options_free(opt);
or_options_free(dflt);
tor_free(msg); tor_free(msg);
clear_log_messages(); clear_log_messages();
} }
@ -295,15 +290,13 @@ test_have_enough_mem_for_dircache(void *arg)
{ {
(void)arg; (void)arg;
or_options_t *opt=NULL; or_options_t *opt=NULL;
or_options_t *dflt=NULL;
config_line_t *cl=NULL; config_line_t *cl=NULL;
char *msg=NULL; char *msg=NULL;
int r; int r;
const char *configuration = "ORPort 8080\nDirCache 1", *expect_errmsg; const char *configuration = "ORPort 8080\nDirCache 1", *expect_errmsg;
setup_options(opt, dflt); setup_options(opt);
setup_log_callback(); setup_log_callback();
(void)dflt;
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);
@ -377,7 +370,6 @@ test_have_enough_mem_for_dircache(void *arg)
done: done:
if (msg) if (msg)
tor_free(msg); tor_free(msg);
or_options_free(dflt);
or_options_free(opt); or_options_free(opt);
config_free_lines(cl); config_free_lines(cl);
return; return;