commit 2780cbb9cb9905a7194364d791da4d94ac419998 Merge: d475d7c2f c32d48594 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 22 17:25:35 2019 -0400

Merge branch 'ticket30935' into ticket30935_merged

scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 258 ++++++++++++------------------ src/app/config/config.h | 2 +- src/app/config/confparse.c | 80 ++++----- src/app/config/confparse.h | 70 ++------ src/app/config/statefile.c | 11 +- src/app/config/testnet.inc | 33 ++++ src/core/include.am | 7 +- src/feature/dirauth/shared_random_state.c | 16 +- src/lib/conf/.may_include | 1 + src/lib/conf/confmacros.h | 67 ++++++++ src/lib/conf/conftesting.h | 86 ++++++++++ src/lib/conf/conftypes.h | 63 ++++---- src/lib/conf/include.am | 4 +- src/lib/confmgt/structvar.c | 37 +++++ src/lib/confmgt/structvar.h | 5 + src/lib/confmgt/type_defs.c | 65 +++++--- src/lib/confmgt/typedvar.c | 45 ++++++ src/lib/confmgt/typedvar.h | 6 + src/lib/confmgt/var_type_def_st.h | 20 +++ src/test/test_confparse.c | 30 ++-- 21 files changed, 561 insertions(+), 347 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt index 6bc023665,1e1ccda78..0acb6fb7f --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -30,23 -30,24 +30,23 @@@ # Remember: It is better to fix the problem than to add a new exception!

problem file-size /src/app/config/config.c 8518 - problem include-count /src/app/config/config.c 88 + problem include-count /src/app/config/config.c 89 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 589 -problem function-size /src/app/config/config.c:resolve_my_address() 192 -problem function-size /src/app/config/config.c:options_validate() 1217 +problem function-size /src/app/config/config.c:resolve_my_address() 190 +problem function-size /src/app/config/config.c:options_validate() 1209 problem function-size /src/app/config/config.c:options_init_from_torrc() 207 -problem function-size /src/app/config/config.c:options_init_from_string() 173 -problem function-size /src/app/config/config.c:options_init_logs() 146 +problem function-size /src/app/config/config.c:options_init_from_string() 171 +problem function-size /src/app/config/config.c:options_init_logs() 145 problem function-size /src/app/config/config.c:parse_bridge_line() 104 -problem function-size /src/app/config/config.c:parse_transport_line() 191 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 -problem function-size /src/app/config/config.c:parse_port_config() 452 -problem function-size /src/app/config/config.c:parse_ports() 170 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116 -problem function-size /src/app/config/confparse.c:config_assign_value() 205 -problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 -problem include-count /src/app/main/main.c 67 +problem function-size /src/app/config/config.c:parse_transport_line() 189 +problem function-size /src/app/config/config.c:parse_dir_authority_line() 150 +problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 +problem function-size /src/app/config/config.c:parse_port_config() 446 +problem function-size /src/app/config/config.c:parse_ports() 168 +problem function-size /src/app/config/config.c:getinfo_helper_config() 113 +problem file-size /src/app/config/or_options_st.h 1112 +problem include-count /src/app/main/main.c 68 problem function-size /src/app/main/main.c:dumpstats() 102 problem function-size /src/app/main/main.c:tor_init() 137 problem function-size /src/app/main/main.c:sandbox_init_filter() 291