diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-05 11:48:50 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-09-11 09:42:19 -0400 |
| commit | 0d6d96396cf4b56bb99b96d39d1c7366792cdbb6 (patch) | |
| tree | 9cb24ce38099321f827a77b19ed9b2176e07dd81 /src/lib/conf | |
| parent | 5ca5d196acb4b2b237b9ed4bc38fff8b6dbf2bfd (diff) | |
| download | tor-0d6d96396cf4b56bb99b96d39d1c7366792cdbb6.tar.gz tor-0d6d96396cf4b56bb99b96d39d1c7366792cdbb6.zip | |
Remove all CVFLAG_* usage.
Diffstat (limited to 'src/lib/conf')
| -rw-r--r-- | src/lib/conf/confmacros.h | 3 | ||||
| -rw-r--r-- | src/lib/conf/conftypes.h | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index 2a15f09aac..a32667e1ab 100644 --- a/src/lib/conf/confmacros.h +++ b/src/lib/conf/confmacros.h @@ -61,7 +61,8 @@ #define CONFIG_VAR_OBSOLETE(varname) \ { .member = { .name = varname, .type = CONFIG_TYPE_OBSOLETE }, \ - .flags = CVFLAG_OBSOLETE \ + .flags = CFLG_NOSET | CFLG_NOLIST | CFLG_NODUMP | CFLG_NOCOPY | \ + CFLG_NOCMP \ } #endif /* !defined(TOR_LIB_CONF_CONFMACROS_H) */ diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index d8575f3649..1f6120670d 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -169,18 +169,6 @@ typedef struct struct_magic_decl_t { */ #define CFLG_NOREPLACE (1u<<5) -/* Aliases for old individual options. These will get removed soon. */ -#define CVFLAG_NODUMP CFLG_NODUMP - -/** Set of options to make a flag invisible. */ -#define CVFLAG_INVISIBLE \ - (CFLG_NODUMP | CFLG_NOSET | CFLG_NOLIST) -/** - * Set of flags to indicate that a configuration option is obsolete. - **/ -#define CVFLAG_OBSOLETE \ - (CFLG_NOSET | CFLG_NOLIST | CFLG_NODUMP | CFLG_NOCOPY | CFLG_NOCMP) - /** A variable allowed in the configuration file or on the command line. */ typedef struct config_var_t { struct_member_t member; /** A struct member corresponding to this |