diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-05 11:48:44 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-09-11 09:42:19 -0400 |
| commit | 1b3b6d9f2d94e659375257a5c439d250ce0075fd (patch) | |
| tree | 84892d879db29f5e4f94bc0dee886eef076fb4e1 /src/lib/confmgt/structvar.h | |
| parent | 4b92f4c83a27149696e148412e09ae814f96b2eb (diff) | |
| download | tor-1b3b6d9f2d94e659375257a5c439d250ce0075fd.tar.gz tor-1b3b6d9f2d94e659375257a5c439d250ce0075fd.zip | |
Replace low-level {var_type,struct_var}_is_*() with flag inspection
Since the flags are now stored with compatible numbering, we can
just OR them together and see whether the flag we want is in the
result.
(Net code removal!)
Diffstat (limited to 'src/lib/confmgt/structvar.h')
| -rw-r--r-- | src/lib/confmgt/structvar.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/confmgt/structvar.h b/src/lib/confmgt/structvar.h index e6dbc6d6ec..201211f795 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); @@ -45,9 +46,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, |