commit 0d6d96396cf4b56bb99b96d39d1c7366792cdbb6 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 5 11:48:50 2019 -0400

Remove all CVFLAG_* usage. --- src/app/config/config.c | 4 ++-- src/lib/conf/confmacros.h | 3 ++- src/lib/conf/conftypes.h | 12 ------------ 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c index 9c93198a4..55e82934e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -267,10 +267,10 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t);

#define VAR_NODUMP(varname,conftype,member,initvalue) \ CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member, \ - CVFLAG_NODUMP, initvalue) + CFLG_NODUMP, initvalue) #define VAR_INVIS(varname,conftype,member,initvalue) \ CONFIG_VAR_ETYPE(or_options_t, varname, conftype, member, \ - CVFLAG_NODUMP|CVFLAG_INVISIBLE, initvalue) + CFLG_NODUMP | CFLG_NOSET | CFLG_NOLIST, initvalue)

#define V(member,conftype,initvalue) \ VAR(#member, conftype, member, initvalue) diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index 2a15f09aa..a32667e1a 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 d8575f364..1f6120670 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