diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-05 11:48:48 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-09-11 09:42:19 -0400 |
| commit | 5ca5d196acb4b2b237b9ed4bc38fff8b6dbf2bfd (patch) | |
| tree | 029e337a29763dc62531eaa7241f0a0cca239385 /src/lib/confmgt | |
| parent | 9b571d4729f0a6a6c1040ad9cb3e452ff0a5cee6 (diff) | |
| download | tor-5ca5d196acb4b2b237b9ed4bc38fff8b6dbf2bfd.tar.gz tor-5ca5d196acb4b2b237b9ed4bc38fff8b6dbf2bfd.zip | |
Remove all VTFLAG_* usage.
Diffstat (limited to 'src/lib/confmgt')
| -rw-r--r-- | src/lib/confmgt/type_defs.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c index e311319c09..a0431e4f88 100644 --- a/src/lib/confmgt/type_defs.c +++ b/src/lib/confmgt/type_defs.c @@ -725,13 +725,22 @@ static const var_type_def_t type_definitions_table[] = { [CONFIG_TYPE_CSV_INTERVAL] = { .name="TimeInterval", .fns=&legacy_csv_interval_fns, }, [CONFIG_TYPE_LINELIST] = { .name="LineList", .fns=&linelist_fns, - .flags=VTFLAG_CUMULATIVE }, + .flags=CFLG_NOREPLACE }, + /* + * A "linelist_s" is a derived view of a linelist_v: inspecting + * it gets part of a linelist_v, and setting it adds to the linelist_v. + */ [CONFIG_TYPE_LINELIST_S] = { .name="Dependent", .fns=&linelist_s_fns, - .flags=VTFLAG_CUMULATIVE|VTFLAG_CONTAINED }, + .flags=CFLG_NOREPLACE| + /* The operations we disable here are + * handled by the linelist_v. */ + CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP }, [CONFIG_TYPE_LINELIST_V] = { .name="Virtual", .fns=&linelist_v_fns, - .flags=VTFLAG_CUMULATIVE|VTFLAG_UNSETTABLE }, - [CONFIG_TYPE_OBSOLETE] = { .name="Obsolete", .fns=&ignore_fns, - .flags=VTFLAG_CONTAINED|VTFLAG_UNSETTABLE } + .flags=CFLG_NOREPLACE|CFLG_NOSET }, + [CONFIG_TYPE_OBSOLETE] = { + .name="Obsolete", .fns=&ignore_fns, + .flags=CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET|CFLG_NOLIST + } }; /** |