diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-07 09:25:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-07 11:01:25 -0500 |
| commit | a08969e460af2834c037761e96e2c1e9fedf5b14 (patch) | |
| tree | da9f5a0402470aba73084635fee351eaa1124e39 /src/lib/conf | |
| parent | 36af84ba5062b26d2ede647627e87f6ae74796cf (diff) | |
| download | tor-a08969e460af2834c037761e96e2c1e9fedf5b14.tar.gz tor-a08969e460af2834c037761e96e2c1e9fedf5b14.zip | |
Refactor "OBSOLETE" type
It no longer warns, and is now defined in terms of an "IGNORE" type.
(The "IGNORE" type is the same as "OBSOLETE", except that it is not
reported as obsolete. It should be useful for disabled modules.)
Closes ticket 32404.
Diffstat (limited to 'src/lib/conf')
| -rw-r--r-- | src/lib/conf/confdecl.h | 1 | ||||
| -rw-r--r-- | src/lib/conf/conftypes.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 19b6f85090..e165155750 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -191,6 +191,7 @@ extern const struct var_type_def_t CSV_INTERVAL_type_defn; extern const struct var_type_def_t LINELIST_type_defn; extern const struct var_type_def_t LINELIST_V_type_defn; extern const struct var_type_def_t LINELIST_S_type_defn; +extern const struct var_type_def_t IGNORE_type_defn; extern const struct var_type_def_t OBSOLETE_type_defn; /**@}*/ diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index bf748efbb7..ea1c8d4764 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -64,7 +64,8 @@ typedef enum config_type_t { CONFIG_TYPE_LINELIST_V, /**< Catch-all "virtual" option to summarize * context-sensitive config lines when fetching. */ - CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */ + CONFIG_TYPE_OBSOLETE, /**< Ignored (obsolete) option. Uses no storage. */ + CONFIG_TYPE_IGNORE, /**< Ignored option. Uses no storage. */ /** * Extended type: definition appears in the <b>type_def</b> pointer * of the corresponding struct_member_t. |