Remove all CVFLAG_* usage.

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 9c93198a45b62ab261d67800b4bde239501be8db..55e82934ecf5cb3186d3c5556ea1488445005fb1 100644 (file)
--- 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 2a15f09aac0e8626d884d1e6c707e94b16d62dc9..a32667e1abdba52f2248ee0ee750d504bb57d509 100644 (file)
--- 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 d8575f364920ab36a3da908cab5396e34c67fe37..1f6120670dec253912731a1c77c38c46a645d3d1 100644 (file)
--- 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