diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-05 10:18:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-07 07:28:43 -0500 |
| commit | 0f0a9bdf332002bb0542dae6bb00e922af5dcf63 (patch) | |
| tree | 4a25bc3928f62bd08c49c55ff1345db5fa8b91f6 /src/test/test_confmgr.c | |
| parent | 0d8504e70b0c6ff92f38fc7f4b4c38037d121e69 (diff) | |
| download | tor-0f0a9bdf332002bb0542dae6bb00e922af5dcf63.tar.gz tor-0f0a9bdf332002bb0542dae6bb00e922af5dcf63.zip | |
Stop using "config_suite_offset=-1" to indicate "no config suite."
Instead, create a separate "has_config_suite" boolean, so that only
top-level formats with config_suites need to declare an offset at
all.
Diffstat (limited to 'src/test/test_confmgr.c')
| -rw-r--r-- | src/test/test_confmgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/test_confmgr.c b/src/test/test_confmgr.c index 375a513c07..b59bd8c6a0 100644 --- a/src/test/test_confmgr.c +++ b/src/test/test_confmgr.c @@ -193,6 +193,7 @@ static const config_format_t pasture_fmt = { offsetof(pasture_cfg_t, magic) }, .vars = pasture_vars, + .has_config_suite = true, .config_suite_offset = offsetof(pasture_cfg_t, subobjs), .legacy_validate_fn = legacy_validate_pasture, }; @@ -205,7 +206,6 @@ static const config_format_t llama_fmt = { offsetof(llama_cfg_t, magic) }, .vars = llama_vars, - .config_suite_offset = -1, .deprecations = llama_deprecations, .abbrevs = llama_abbrevs, .clear_fn = clear_llama_cfg, @@ -221,7 +221,6 @@ static const config_format_t alpaca_fmt = { offsetof(alpaca_cfg_t, magic) }, .vars = alpaca_vars, - .config_suite_offset = -1, .deprecations = alpaca_deprecations, .pre_normalize_fn = pre_normalize_alpaca, .check_transition_fn = check_transition_alpaca, |