summaryrefslogtreecommitdiff
path: root/src/app/config/confparse.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-07-23 11:32:52 -0400
committerNick Mathewson <nickm@torproject.org>2019-08-28 09:40:53 -0400
commit38b770bbbb37aef6cd3cef5fd6f425cd951affe2 (patch)
tree65a613a67a7f9baf09c4f8cdcbe1e7efb8b613bb /src/app/config/confparse.h
parent47654d32497acae23aafbe3316ae73d3c00429c8 (diff)
downloadtor-38b770bbbb37aef6cd3cef5fd6f425cd951affe2.tar.gz
tor-38b770bbbb37aef6cd3cef5fd6f425cd951affe2.zip
Make a config_suite_t type to hold multiple config sub-objects
Right now, it doesn't do anything; this patch is meant to make sure that we're doing memory management correctly.
Diffstat (limited to 'src/app/config/confparse.h')
-rw-r--r--src/app/config/confparse.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index 2e1a4b4f57..c18e854237 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -61,6 +61,9 @@ typedef struct config_format_t {
/** If present, extra denotes a LINELIST variable for unrecognized
* lines. Otherwise, unrecognized lines are an error. */
const struct_member_t *extra;
+ /** The position of a config_suite_t pointer within the toplevel object,
+ * or -1 if there is no such pointer. */
+ int config_suite_offset;
} config_format_t;
/**
@@ -79,6 +82,9 @@ void config_mgr_freeze(config_mgr_t *mgr);
struct smartlist_t *config_mgr_list_vars(const config_mgr_t *mgr);
struct smartlist_t *config_mgr_list_deprecated_vars(const config_mgr_t *mgr);
+/** A collection of managed configuration objects. */
+typedef struct config_suite_t config_suite_t;
+
#define CAL_USE_DEFAULTS (1u<<0)
#define CAL_CLEAR_FIRST (1u<<1)
#define CAL_WARN_DEPRECATIONS (1u<<2)