aboutsummaryrefslogtreecommitdiff
path: root/src/lib/confmgt/structvar.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-09-11 09:42:31 -0400
committerDavid Goulet <dgoulet@torproject.org>2019-09-11 09:42:31 -0400
commit41261c3b5cd505f5a601c319eb484866903814af (patch)
tree3264e3e0293865ab9012d53aaf835f3713d8c6ef /src/lib/confmgt/structvar.h
parent049705fc1c9d1c0cee120dc8cbd1a719c6e45e85 (diff)
parent478141e617a333ac4d998e3747c073246e04b5ae (diff)
downloadtor-41261c3b5cd505f5a601c319eb484866903814af.tar.gz
tor-41261c3b5cd505f5a601c319eb484866903814af.zip
Merge branch 'tor-github/pr/1296'
Diffstat (limited to 'src/lib/confmgt/structvar.h')
-rw-r--r--src/lib/confmgt/structvar.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/confmgt/structvar.h b/src/lib/confmgt/structvar.h
index 9783d1ec27..bcb4b58c3f 100644
--- a/src/lib/confmgt/structvar.h
+++ b/src/lib/confmgt/structvar.h
@@ -17,6 +17,7 @@ struct struct_member_t;
struct config_line_t;
#include <stdbool.h>
+#include "lib/cc/torint.h"
void struct_set_magic(void *object,
const struct struct_magic_decl_t *decl);
@@ -41,9 +42,7 @@ void struct_var_mark_fragile(void *object,
const char *struct_var_get_name(const struct struct_member_t *member);
const char *struct_var_get_typename(const struct struct_member_t *member);
-bool struct_var_is_cumulative(const struct struct_member_t *member);
-bool struct_var_is_settable(const struct struct_member_t *member);
-bool struct_var_is_contained(const struct struct_member_t *member);
+uint32_t struct_var_get_flags(const struct struct_member_t *member);
int struct_var_kvassign(void *object, const struct config_line_t *line,
char **errmsg,