aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-09-05 11:48:36 -0400
committerDavid Goulet <dgoulet@torproject.org>2019-09-11 09:42:19 -0400
commit4f6b592691b0057dca55ce92beefc6b7e671a4ae (patch)
treef1e38cd0e932f83ccc87a97ce639db98c7c90467
parent7171ce2a2a4d51db5b39908b7b4d4eb0e4c28a30 (diff)
downloadtor-4f6b592691b0057dca55ce92beefc6b7e671a4ae.tar.gz
tor-4f6b592691b0057dca55ce92beefc6b7e671a4ae.zip
struct_var: refactor struct_var_is*() functions to delegate
Previously they checked the individual flags inside var_type_def_t; now they call the appropriate var_type_is_*() functions. (These functions will be removed entirely by the end of this branch.)
-rw-r--r--src/lib/confmgt/structvar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index 32f616c214..6b725f613e 100644
--- a/src/lib/confmgt/structvar.c
+++ b/src/lib/confmgt/structvar.c
@@ -243,7 +243,7 @@ struct_var_is_cumulative(const struct_member_t *member)
{
const var_type_def_t *def = get_type_def(member);
- return def ? def->is_cumulative : false;
+ return def ? var_type_is_cumulative(def) : false;
}
bool
@@ -251,7 +251,7 @@ struct_var_is_settable(const struct_member_t *member)
{
const var_type_def_t *def = get_type_def(member);
- return def ? !def->is_unsettable : true;
+ return def ? var_type_is_settable(def) : true;
}
bool
@@ -259,5 +259,5 @@ struct_var_is_contained(const struct_member_t *member)
{
const var_type_def_t *def = get_type_def(member);
- return def ? def->is_contained : false;
+ return def ? var_type_is_contained(def) : false;
}