[tor-commits] [tor/master] struct_var: refactor struct_var_is*() functions to delegate

[dgoulet at torproject.org]

commit 4f6b592691b0057dca55ce92beefc6b7e671a4ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 5 11:48:36 2019 -0400

    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.)
---
 src/lib/confmgt/structvar.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c
index 32f616c21..6b725f613 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;
 }