Commit 0d6d9639 authored by Nick Mathewson's avatar Nick Mathewson 🎻 Committed by David Goulet
Browse files

Remove all CVFLAG_* usage.

parent 5ca5d196
......@@ -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)
......
......@@ -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) */
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment