commit 686494f0f71b9235399b8241aba3e0c2fcb03ea1 Merge: edc0bf508 b5ccdd978 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 5 08:23:32 2020 -0500
Merge branch 'clang_format_prep_3'
.clang-format | 163 +++++++++++++++++++++++++ scripts/maint/checkSpace.pl | 47 ++++--- scripts/maint/checkspace_tests/expected.txt | 1 - scripts/maint/clang-format.sh | 41 +++++++ scripts/maint/codetool.py | 182 ++++++++++++++++++++++++++++ src/app/config/config.c | 2 +- src/app/config/statefile.c | 2 + src/core/or/channel.c | 8 +- src/core/or/circuitlist.c | 4 +- src/core/or/circuitmux.c | 4 +- src/core/or/connection_or.c | 4 +- src/core/or/policies.c | 4 +- src/core/or/scheduler_kist.c | 8 +- src/ext/ht.h | 10 +- src/feature/client/entrynodes.c | 2 + src/feature/control/btrack_orconn_maps.c | 9 +- src/feature/control/control_cmd.c | 4 +- src/feature/control/control_events.h | 6 +- src/feature/dirauth/dircollate.c | 5 +- src/feature/dirauth/dirvote.c | 2 +- src/feature/dirauth/keypin.c | 8 +- src/feature/dirauth/shared_random_state.c | 2 + src/feature/dircache/consdiffmgr.c | 4 +- src/feature/dirclient/dirclient.c | 5 +- src/feature/dircommon/fp_pair.c | 5 +- src/feature/dirparse/authcert_members.h | 2 + src/feature/dirparse/authcert_parse.c | 2 + src/feature/dirparse/microdesc_parse.c | 2 + src/feature/dirparse/ns_parse.c | 8 ++ src/feature/dirparse/routerparse.c | 4 + src/feature/hs/hs_circuitmap.c | 4 +- src/feature/hs/hs_service.c | 4 +- src/feature/nodelist/authcert.c | 2 +- src/feature/nodelist/microdesc.c | 4 +- src/feature/nodelist/nodefamily.c | 4 +- src/feature/nodelist/nodelist.c | 8 +- src/feature/nodelist/routerlist.c | 6 +- src/feature/relay/dns.c | 4 +- src/feature/relay/onion_queue.c | 6 +- src/feature/stats/geoip_stats.c | 8 +- src/feature/stats/rephist.c | 4 +- src/lib/cc/compat_compiler.h | 4 +- src/lib/cc/torint.h | 7 +- src/lib/conf/conftypes.h | 4 +- src/lib/confmgt/unitparse.c | 6 + src/lib/container/map.c | 12 +- src/lib/container/map.h | 112 ++++++++--------- src/lib/container/namemap.c | 4 +- src/lib/ctime/di_ops.c | 4 +- src/lib/log/log.c | 2 +- src/lib/log/util_bug.c | 2 - src/lib/malloc/map_anon.c | 2 +- src/lib/math/prob_distr.c | 8 +- src/lib/memarea/memarea.c | 2 +- src/lib/net/address.c | 2 +- src/lib/net/resolve.c | 4 +- src/lib/osinfo/uname.c | 59 +++++---- src/lib/process/waitpid.c | 4 +- src/test/log_test_helpers.h | 16 +-- src/test/test_connection.c | 9 +- src/test/test_consdiff.c | 14 +-- src/test/test_dir.c | 6 +- src/test/test_prob_distr.c | 4 +- src/test/test_pt.c | 4 +- src/test/test_util.c | 18 +-- src/test/test_util_process.c | 7 +- 66 files changed, 686 insertions(+), 234 deletions(-)