From: Roger Dingledine Date: Tue, 1 Jul 2025 05:59:45 +0000 (-0400) Subject: clean up tabs/whitespace in automake files X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26562e4039d5dcdc4b3e0756b60ba1ca6070e468;p=thirdparty%2Ftor.git clean up tabs/whitespace in automake files it used to be a clean set of tabs but it accumulated chaos over the years diff is best viewed with git diff -w --- diff --git a/configure.ac b/configure.ac index ed1b92c416..98eb9c903f 100644 --- a/configure.ac +++ b/configure.ac @@ -1157,7 +1157,7 @@ dnl to them. AC_CHECK_FUNCS([ \ EVP_PBE_scrypt \ SSL_CTX_set_security_level \ - SSL_set_ciphersuites + SSL_set_ciphersuites ]) fi # enable_nss diff --git a/src/app/config/include.am b/src/app/config/include.am index 14320a6b11..ab7c6315dc 100644 --- a/src/app/config/include.am +++ b/src/app/config/include.am @@ -16,7 +16,6 @@ noinst_HEADERS += \ src/app/config/statefile.h \ src/app/config/tor_cmdline_mode.h - noinst_HEADERS += \ src/app/config/auth_dirs.inc \ src/app/config/fallback_dirs.inc \ diff --git a/src/core/crypto/include.am b/src/core/crypto/include.am index 22a7c655ef..6e66aa0e49 100644 --- a/src/core/crypto/include.am +++ b/src/core/crypto/include.am @@ -1,24 +1,24 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/core/crypto/hs_ntor.c \ src/core/crypto/onion_crypto.c \ src/core/crypto/onion_fast.c \ src/core/crypto/onion_ntor.c \ src/core/crypto/onion_ntor_v3.c \ - src/core/crypto/relay_crypto.c \ - src/core/crypto/relay_crypto_cgo.c \ - src/core/crypto/relay_crypto_tor1.c + src/core/crypto/relay_crypto.c \ + src/core/crypto/relay_crypto_cgo.c \ + src/core/crypto/relay_crypto_tor1.c # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/core/crypto/hs_ntor.h \ - src/core/crypto/onion_crypto.h \ + src/core/crypto/onion_crypto.h \ src/core/crypto/onion_fast.h \ src/core/crypto/onion_ntor.h \ src/core/crypto/onion_ntor_v3.h \ - src/core/crypto/relay_crypto.h \ - src/core/crypto/relay_crypto_st.h \ - src/core/crypto/relay_crypto_cgo.h \ - src/core/crypto/relay_crypto_tor1.h \ - src/core/crypto/tor1_crypt_st.h + src/core/crypto/relay_crypto.h \ + src/core/crypto/relay_crypto_st.h \ + src/core/crypto/relay_crypto_cgo.h \ + src/core/crypto/relay_crypto_tor1.h \ + src/core/crypto/tor1_crypt_st.h diff --git a/src/core/mainloop/include.am b/src/core/mainloop/include.am index 63643127f3..931bbea380 100644 --- a/src/core/mainloop/include.am +++ b/src/core/mainloop/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/core/mainloop/connection.c \ src/core/mainloop/cpuworker.c \ src/core/mainloop/mainloop.c \ @@ -15,8 +15,8 @@ noinst_HEADERS += \ src/core/mainloop/cpuworker.h \ src/core/mainloop/mainloop.h \ src/core/mainloop/mainloop_pubsub.h \ - src/core/mainloop/mainloop_state.inc \ - src/core/mainloop/mainloop_state_st.h \ + src/core/mainloop/mainloop_state.inc \ + src/core/mainloop/mainloop_state_st.h \ src/core/mainloop/mainloop_sys.h \ src/core/mainloop/netstatus.h \ src/core/mainloop/periodic.h diff --git a/src/core/or/include.am b/src/core/or/include.am index 5f75581f09..2d2141c06c 100644 --- a/src/core/or/include.am +++ b/src/core/or/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/core/or/address_set.c \ src/core/or/channel.c \ src/core/or/channelpadding.c \ @@ -18,9 +18,9 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/connection_edge.c \ src/core/or/connection_or.c \ src/core/or/dos.c \ - src/core/or/dos_config.c \ + src/core/or/dos_config.c \ src/core/or/dos_sys.c \ - src/core/or/extendinfo.c \ + src/core/or/extendinfo.c \ src/core/or/onion.c \ src/core/or/ocirc_event.c \ src/core/or/or_periodic.c \ @@ -30,20 +30,20 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/protover.c \ src/core/or/reasons.c \ src/core/or/relay.c \ - src/core/or/relay_msg.c \ + src/core/or/relay_msg.c \ src/core/or/scheduler.c \ src/core/or/scheduler_kist.c \ src/core/or/scheduler_vanilla.c \ src/core/or/sendme.c \ - src/core/or/congestion_control_common.c \ - src/core/or/congestion_control_vegas.c \ - src/core/or/congestion_control_flow.c \ + src/core/or/congestion_control_common.c \ + src/core/or/congestion_control_vegas.c \ + src/core/or/congestion_control_flow.c \ src/core/or/conflux.c \ - src/core/or/conflux_cell.c \ - src/core/or/conflux_params.c \ - src/core/or/conflux_pool.c \ - src/core/or/conflux_sys.c \ - src/core/or/conflux_util.c \ + src/core/or/conflux_cell.c \ + src/core/or/conflux_params.c \ + src/core/or/conflux_pool.c \ + src/core/or/conflux_sys.c \ + src/core/or/conflux_util.c \ src/core/or/status.c \ src/core/or/versions.c @@ -66,7 +66,7 @@ noinst_HEADERS += \ src/core/or/circuitpadding_machines.h \ src/core/or/circuituse.h \ src/core/or/command.h \ - src/core/or/congestion_control_st.h \ + src/core/or/congestion_control_st.h \ src/core/or/connection_edge.h \ src/core/or/connection_or.h \ src/core/or/connection_st.h \ @@ -76,9 +76,9 @@ noinst_HEADERS += \ src/core/or/crypt_path_st.h \ src/core/or/destroy_cell_queue_st.h \ src/core/or/dos.h \ - src/core/or/dos_config.h \ - src/core/or/dos_options.inc \ - src/core/or/dos_options_st.h \ + src/core/or/dos_config.h \ + src/core/or/dos_options.inc \ + src/core/or/dos_options_st.h \ src/core/or/dos_sys.h \ src/core/or/edge_connection_st.h \ src/core/or/extendinfo.h \ @@ -105,18 +105,18 @@ noinst_HEADERS += \ src/core/or/protover.h \ src/core/or/reasons.h \ src/core/or/relay.h \ - src/core/or/relay_msg.h \ - src/core/or/relay_msg_st.h \ + src/core/or/relay_msg.h \ + src/core/or/relay_msg_st.h \ src/core/or/scheduler.h \ src/core/or/sendme.h \ - src/core/or/congestion_control_flow.h \ - src/core/or/congestion_control_common.h \ - src/core/or/congestion_control_vegas.h \ + src/core/or/congestion_control_flow.h \ + src/core/or/congestion_control_common.h \ + src/core/or/congestion_control_vegas.h \ src/core/or/conflux.h \ src/core/or/conflux_cell.h \ src/core/or/conflux_params.h \ src/core/or/conflux_pool.h \ - src/core/or/conflux_st.h \ + src/core/or/conflux_st.h \ src/core/or/conflux_sys.h \ src/core/or/conflux_util.h \ src/core/or/server_port_cfg_st.h \ @@ -128,9 +128,9 @@ noinst_HEADERS += \ if USE_TRACING_INSTRUMENTATION_LTTNG LIBTOR_APP_A_SOURCES += \ - src/core/or/trace_probes_cc.c \ + src/core/or/trace_probes_cc.c \ src/core/or/trace_probes_circuit.c noinst_HEADERS += \ - src/core/or/trace_probes_cc.h \ + src/core/or/trace_probes_cc.h \ src/core/or/trace_probes_circuit.h endif diff --git a/src/core/proto/include.am b/src/core/proto/include.am index 726ef924cf..c8395dd956 100644 --- a/src/core/proto/include.am +++ b/src/core/proto/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/core/proto/proto_cell.c \ src/core/proto/proto_control0.c \ src/core/proto/proto_ext_or.c \ diff --git a/src/ext/include.am b/src/ext/include.am index c8dfffcb62..e9a6b9c9cd 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -6,15 +6,15 @@ AM_CPPFLAGS += \ EXTRA_DIST += src/ext/ext.md EXTHEADERS = \ - src/ext/ht.h \ - src/ext/byteorder.h \ - src/ext/tinytest.h \ + src/ext/ht.h \ + src/ext/byteorder.h \ + src/ext/tinytest.h \ src/ext/tor_readpassphrase.h \ - src/ext/strlcat.c \ - src/ext/strlcpy.c \ - src/ext/getdelim.c \ + src/ext/strlcat.c \ + src/ext/strlcpy.c \ + src/ext/getdelim.c \ src/ext/tinytest_macros.h \ - src/ext/tor_queue.h \ + src/ext/tor_queue.h \ src/ext/siphash.h \ src/ext/compat_blake2.h \ src/ext/timeouts/timeout.h \ diff --git a/src/feature/client/include.am b/src/feature/client/include.am index 53c9f047d4..a5538c4fd0 100644 --- a/src/feature/client/include.am +++ b/src/feature/client/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/client/addressmap.c \ src/feature/client/bridges.c \ src/feature/client/circpathbias.c \ diff --git a/src/feature/control/include.am b/src/feature/control/include.am index 101fe3c705..843bd3a0b5 100644 --- a/src/feature/control/include.am +++ b/src/feature/control/include.am @@ -1,11 +1,11 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/control/btrack.c \ src/feature/control/btrack_circuit.c \ src/feature/control/btrack_orconn.c \ - src/feature/control/btrack_orconn_cevent.c \ - src/feature/control/btrack_orconn_maps.c \ + src/feature/control/btrack_orconn_cevent.c\ + src/feature/control/btrack_orconn_maps.c\ src/feature/control/control.c \ src/feature/control/control_auth.c \ src/feature/control/control_bootstrap.c \ diff --git a/src/feature/dircommon/include.am b/src/feature/dircommon/include.am index 87850ce183..3a1b160555 100644 --- a/src/feature/dircommon/include.am +++ b/src/feature/dircommon/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/dircommon/consdiff.c \ src/feature/dircommon/directory.c \ src/feature/dircommon/fp_pair.c diff --git a/src/feature/hibernate/include.am b/src/feature/hibernate/include.am index 355e591392..4cd09aebb3 100644 --- a/src/feature/hibernate/include.am +++ b/src/feature/hibernate/include.am @@ -4,5 +4,5 @@ LIBTOR_APP_A_SOURCES += \ src/feature/hibernate/hibernate.c # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/feature/hibernate/hibernate.h diff --git a/src/feature/hs/include.am b/src/feature/hs/include.am index b64ab1b41c..b4b74d81b7 100644 --- a/src/feature/hs/include.am +++ b/src/feature/hs/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/hs/hs_cache.c \ src/feature/hs/hs_cell.c \ src/feature/hs/hs_circuit.c \ @@ -13,11 +13,11 @@ LIBTOR_APP_A_SOURCES += \ src/feature/hs/hs_dos.c \ src/feature/hs/hs_ident.c \ src/feature/hs/hs_intropoint.c \ - src/feature/hs/hs_metrics.c \ + src/feature/hs/hs_metrics.c \ src/feature/hs/hs_ob.c \ src/feature/hs/hs_service.c \ src/feature/hs/hs_stats.c \ - src/feature/hs/hs_sys.c \ + src/feature/hs/hs_sys.c \ src/feature/hs/hs_metrics_entry.c # Proof of Work module @@ -42,7 +42,7 @@ noinst_HEADERS += \ src/feature/hs/hs_dos.h \ src/feature/hs/hs_ident.h \ src/feature/hs/hs_intropoint.h \ - src/feature/hs/hs_metrics.h \ + src/feature/hs/hs_metrics.h \ src/feature/hs/hs_ob.h \ src/feature/hs/hs_opts_st.h \ src/feature/hs/hs_options.inc \ @@ -50,5 +50,5 @@ noinst_HEADERS += \ src/feature/hs/hs_service.h \ src/feature/hs/hs_stats.h \ src/feature/hs/hsdir_index_st.h \ - src/feature/hs/hs_sys.h \ + src/feature/hs/hs_sys.h \ src/feature/hs/hs_metrics_entry.h diff --git a/src/feature/hs_common/include.am b/src/feature/hs_common/include.am index 3bb9225c12..df2730868f 100644 --- a/src/feature/hs_common/include.am +++ b/src/feature/hs_common/include.am @@ -1,7 +1,7 @@ # ADD_C_FILE: INSERT SOURCES HERE. LIBTOR_APP_A_SOURCES += \ - src/feature/hs_common/replaycache.c \ + src/feature/hs_common/replaycache.c \ src/feature/hs_common/shared_random_client.c # ADD_C_FILE: INSERT HEADERS HERE. diff --git a/src/feature/metrics/include.am b/src/feature/metrics/include.am index 0e875f43ad..9e58762ede 100644 --- a/src/feature/metrics/include.am +++ b/src/feature/metrics/include.am @@ -1,10 +1,10 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/metrics/metrics.c \ src/feature/metrics/metrics_sys.c # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/feature/metrics/metrics.h \ src/feature/metrics/metrics_sys.h diff --git a/src/feature/nodelist/include.am b/src/feature/nodelist/include.am index 2f5d58ec1c..f97866bd1b 100644 --- a/src/feature/nodelist/include.am +++ b/src/feature/nodelist/include.am @@ -1,6 +1,6 @@ # ADD_C_FILE: INSERT SOURCES HERE. -LIBTOR_APP_A_SOURCES += \ +LIBTOR_APP_A_SOURCES += \ src/feature/nodelist/authcert.c \ src/feature/nodelist/describe.c \ src/feature/nodelist/dirlist.c \ @@ -30,7 +30,7 @@ noinst_HEADERS += \ src/feature/nodelist/networkstatus.h \ src/feature/nodelist/networkstatus_sr_info_st.h \ src/feature/nodelist/networkstatus_st.h \ - src/feature/nodelist/networkstatus_voter_info_st.h \ + src/feature/nodelist/networkstatus_voter_info_st.h\ src/feature/nodelist/nickname.h \ src/feature/nodelist/node_st.h \ src/feature/nodelist/nodefamily.h \ diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index 8a121cef01..d95ea72e9b 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -11,7 +11,7 @@ LIBTOR_APP_A_SOURCES += \ MODULE_RELAY_SOURCES = \ src/feature/relay/circuitbuild_relay.c \ src/feature/relay/dns.c \ - src/feature/relay/ext_orport.c \ + src/feature/relay/ext_orport.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ src/feature/relay/relay_handshake.c \ @@ -31,7 +31,7 @@ noinst_HEADERS += \ src/feature/relay/onion_queue.h \ src/feature/relay/relay_config.h \ src/feature/relay/relay_handshake.h \ - src/feature/relay/relay_metrics.h \ + src/feature/relay/relay_metrics.h \ src/feature/relay/relay_periodic.h \ src/feature/relay/relay_sys.h \ src/feature/relay/relay_find_addr.h \ diff --git a/src/feature/rend/include.am b/src/feature/rend/include.am index d338869b5b..de33282da2 100644 --- a/src/feature/rend/include.am +++ b/src/feature/rend/include.am @@ -5,6 +5,6 @@ LIBTOR_APP_A_SOURCES += \ src/feature/rend/rendmid.c # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ - src/feature/rend/rendcommon.h \ +noinst_HEADERS += \ + src/feature/rend/rendcommon.h \ src/feature/rend/rendmid.h diff --git a/src/feature/stats/include.am b/src/feature/stats/include.am index 5be519936f..bda8f42fd3 100644 --- a/src/feature/stats/include.am +++ b/src/feature/stats/include.am @@ -9,7 +9,7 @@ LIBTOR_APP_A_SOURCES += \ # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ - src/feature/stats/bw_array_st.h \ + src/feature/stats/bw_array_st.h \ src/feature/stats/bwhist.h \ src/feature/stats/connstats.h \ src/feature/stats/geoip_stats.h \ diff --git a/src/lib/conf/include.am b/src/lib/conf/include.am index cb0b83fa64..45f5041a86 100644 --- a/src/lib/conf/include.am +++ b/src/lib/conf/include.am @@ -1,7 +1,7 @@ # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ - src/lib/conf/confdecl.h \ - src/lib/conf/conftesting.h \ - src/lib/conf/conftypes.h \ + src/lib/conf/confdecl.h \ + src/lib/conf/conftesting.h \ + src/lib/conf/conftypes.h \ src/lib/conf/confmacros.h diff --git a/src/lib/confmgt/include.am b/src/lib/confmgt/include.am index d3a7a7cd69..c4ce2d0415 100644 --- a/src/lib/confmgt/include.am +++ b/src/lib/confmgt/include.am @@ -6,10 +6,10 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_confmgt_a_SOURCES = \ - src/lib/confmgt/confmgt.c \ - src/lib/confmgt/structvar.c \ - src/lib/confmgt/type_defs.c \ - src/lib/confmgt/typedvar.c \ + src/lib/confmgt/confmgt.c \ + src/lib/confmgt/structvar.c \ + src/lib/confmgt/type_defs.c \ + src/lib/confmgt/typedvar.c \ src/lib/confmgt/unitparse.c src_lib_libtor_confmgt_testing_a_SOURCES = \ diff --git a/src/lib/crypt_ops/include.am b/src/lib/crypt_ops/include.am index 7644cab412..ba9f301e7a 100644 --- a/src/lib/crypt_ops/include.am +++ b/src/lib/crypt_ops/include.am @@ -15,14 +15,14 @@ src_lib_libtor_crypt_ops_a_SOURCES = \ src/lib/crypt_ops/crypto_format.c \ src/lib/crypt_ops/crypto_hkdf.c \ src/lib/crypt_ops/crypto_init.c \ - src/lib/crypt_ops/crypto_ope.c \ + src/lib/crypt_ops/crypto_ope.c \ src/lib/crypt_ops/crypto_pwbox.c \ src/lib/crypt_ops/crypto_rand.c \ src/lib/crypt_ops/crypto_rand_fast.c \ src/lib/crypt_ops/crypto_rand_numeric.c \ src/lib/crypt_ops/crypto_rsa.c \ src/lib/crypt_ops/crypto_s2k.c \ - src/lib/crypt_ops/crypto_util.c \ + src/lib/crypt_ops/crypto_util.c \ src/lib/crypt_ops/digestset.c if USE_NSS @@ -75,5 +75,5 @@ noinst_HEADERS += \ src/lib/crypt_ops/crypto_rsa.h \ src/lib/crypt_ops/crypto_s2k.h \ src/lib/crypt_ops/crypto_sys.h \ - src/lib/crypt_ops/crypto_util.h \ + src/lib/crypt_ops/crypto_util.h \ src/lib/crypt_ops/digestset.h diff --git a/src/lib/ctime/include.am b/src/lib/ctime/include.am index 83942ca4e0..16dcf782c3 100644 --- a/src/lib/ctime/include.am +++ b/src/lib/ctime/include.am @@ -13,8 +13,8 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_ctime_a_SOURCES = \ - $(mulodi4_source) \ - src/ext/csiphash.c \ + $(mulodi4_source) \ + src/ext/csiphash.c \ src/lib/ctime/di_ops.c src_lib_libtor_ctime_testing_a_SOURCES = \ diff --git a/src/lib/defs/include.am b/src/lib/defs/include.am index 84ee403771..c80dba1a30 100644 --- a/src/lib/defs/include.am +++ b/src/lib/defs/include.am @@ -1,8 +1,8 @@ # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ - src/lib/defs/dh_sizes.h \ +noinst_HEADERS += \ + src/lib/defs/dh_sizes.h \ src/lib/defs/digest_sizes.h \ src/lib/defs/logging_types.h \ - src/lib/defs/time.h \ + src/lib/defs/time.h \ src/lib/defs/x25519_sizes.h diff --git a/src/lib/dispatch/include.am b/src/lib/dispatch/include.am index 4a0e0dfd90..59cb0b8ddd 100644 --- a/src/lib/dispatch/include.am +++ b/src/lib/dispatch/include.am @@ -20,8 +20,8 @@ src_lib_libtor_dispatch_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/lib/dispatch/dispatch.h \ - src/lib/dispatch/dispatch_cfg.h \ - src/lib/dispatch/dispatch_cfg_st.h \ + src/lib/dispatch/dispatch_cfg.h \ + src/lib/dispatch/dispatch_cfg_st.h \ src/lib/dispatch/dispatch_naming.h \ src/lib/dispatch/dispatch_st.h \ src/lib/dispatch/msgtypes.h diff --git a/src/lib/fdio/include.am b/src/lib/fdio/include.am index 545bbc929e..4d2e8024b8 100644 --- a/src/lib/fdio/include.am +++ b/src/lib/fdio/include.am @@ -15,5 +15,5 @@ src_lib_libtor_fdio_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_fdio_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/lib/fdio/fdio.h diff --git a/src/lib/geoip/include.am b/src/lib/geoip/include.am index ea426d14bc..323e9eec94 100644 --- a/src/lib/geoip/include.am +++ b/src/lib/geoip/include.am @@ -15,5 +15,5 @@ src_lib_libtor_geoip_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ - src/lib/geoip/geoip.h \ + src/lib/geoip/geoip.h \ src/lib/geoip/country.h diff --git a/src/lib/lock/include.am b/src/lib/lock/include.am index 1475b9911b..0fecb00269 100644 --- a/src/lib/lock/include.am +++ b/src/lib/lock/include.am @@ -22,5 +22,5 @@ src_lib_libtor_lock_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_lock_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/lib/lock/compat_mutex.h diff --git a/src/lib/math/include.am b/src/lib/math/include.am index f68b265da7..b83a05830e 100644 --- a/src/lib/math/include.am +++ b/src/lib/math/include.am @@ -7,7 +7,7 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_math_a_SOURCES = \ - src/lib/math/fp.c \ + src/lib/math/fp.c \ src/lib/math/laplace.c \ src/lib/math/prob_distr.c @@ -19,6 +19,6 @@ src_lib_libtor_math_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/lib/math/fp.h \ - src/lib/math/laplace.h \ - src/lib/math/prob_distr.h \ + src/lib/math/laplace.h \ + src/lib/math/prob_distr.h \ src/lib/math/stats.h diff --git a/src/lib/metrics/include.am b/src/lib/metrics/include.am index 62c289446e..04367aad68 100644 --- a/src/lib/metrics/include.am +++ b/src/lib/metrics/include.am @@ -8,8 +8,8 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_metrics_a_SOURCES = \ src/lib/metrics/metrics_store.c \ - src/lib/metrics/metrics_store_entry.c \ - src/lib/metrics/metrics_common.c \ + src/lib/metrics/metrics_store_entry.c \ + src/lib/metrics/metrics_common.c \ src/lib/metrics/prometheus.c src_lib_libtor_metrics_testing_a_SOURCES = \ @@ -18,8 +18,8 @@ src_lib_libtor_metrics_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_metrics_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ - src/lib/metrics/metrics_store.h \ +noinst_HEADERS += \ + src/lib/metrics/metrics_store.h \ src/lib/metrics/metrics_store_entry.h \ src/lib/metrics/metrics_common.h \ src/lib/metrics/prometheus.h diff --git a/src/lib/net/include.am b/src/lib/net/include.am index 485019f4b7..46ba8d3db4 100644 --- a/src/lib/net/include.am +++ b/src/lib/net/include.am @@ -8,7 +8,7 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_net_a_SOURCES = \ src/lib/net/address.c \ - src/lib/net/alertsock.c \ + src/lib/net/alertsock.c \ src/lib/net/buffers_net.c \ src/lib/net/gethostname.c \ src/lib/net/inaddr.c \ @@ -25,7 +25,7 @@ src_lib_libtor_net_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ src/lib/net/address.h \ - src/lib/net/alertsock.h \ + src/lib/net/alertsock.h \ src/lib/net/buffers_net.h \ src/lib/net/gethostname.h \ src/lib/net/inaddr.h \ diff --git a/src/lib/osinfo/include.am b/src/lib/osinfo/include.am index df8c98500c..cb9a01797f 100644 --- a/src/lib/osinfo/include.am +++ b/src/lib/osinfo/include.am @@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-osinfo-testing.a endif # ADD_C_FILE: INSERT SOURCES HERE. -src_lib_libtor_osinfo_a_SOURCES = \ +src_lib_libtor_osinfo_a_SOURCES = \ src/lib/osinfo/uname.c \ src/lib/osinfo/libc.c @@ -16,6 +16,6 @@ src_lib_libtor_osinfo_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_osinfo_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/lib/osinfo/uname.h \ src/lib/osinfo/libc.h diff --git a/src/lib/smartlist_core/include.am b/src/lib/smartlist_core/include.am index 548179bc4f..a9f98c1e14 100644 --- a/src/lib/smartlist_core/include.am +++ b/src/lib/smartlist_core/include.am @@ -7,7 +7,7 @@ endif # ADD_C_FILE: INSERT SOURCES HERE. src_lib_libtor_smartlist_core_a_SOURCES = \ - src/lib/smartlist_core/smartlist_core.c \ + src/lib/smartlist_core/smartlist_core.c \ src/lib/smartlist_core/smartlist_split.c src_lib_libtor_smartlist_core_testing_a_SOURCES = \ @@ -18,6 +18,6 @@ src_lib_libtor_smartlist_core_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. noinst_HEADERS += \ - src/lib/smartlist_core/smartlist_core.h \ - src/lib/smartlist_core/smartlist_foreach.h \ + src/lib/smartlist_core/smartlist_core.h \ + src/lib/smartlist_core/smartlist_foreach.h \ src/lib/smartlist_core/smartlist_split.h diff --git a/src/lib/term/include.am b/src/lib/term/include.am index a120bba0cb..ceda497f1c 100644 --- a/src/lib/term/include.am +++ b/src/lib/term/include.am @@ -22,5 +22,5 @@ src_lib_libtor_term_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_lib_libtor_term_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) # ADD_C_FILE: INSERT HEADERS HERE. -noinst_HEADERS += \ +noinst_HEADERS += \ src/lib/term/getpass.h diff --git a/src/lib/time/include.am b/src/lib/time/include.am index dcb199b142..7ea1b86677 100644 --- a/src/lib/time/include.am +++ b/src/lib/time/include.am @@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-time-testing.a endif # ADD_C_FILE: INSERT SOURCES HERE. -src_lib_libtor_time_a_SOURCES = \ +src_lib_libtor_time_a_SOURCES = \ src/lib/time/compat_time.c \ src/lib/time/time_sys.c \ src/lib/time/tvdiff.c diff --git a/src/test/include.am b/src/test/include.am index 86b9c16a9a..5071f60ab8 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -22,14 +22,14 @@ TESTSCRIPTS = \ src/test/test_switch_id.sh \ src/test/test_cmdline.sh \ src/test/test_parseconf.sh \ - src/test/unittest_part1.sh \ - src/test/unittest_part2.sh \ - src/test/unittest_part3.sh \ - src/test/unittest_part4.sh \ - src/test/unittest_part5.sh \ - src/test/unittest_part6.sh \ - src/test/unittest_part7.sh \ - src/test/unittest_part8.sh + src/test/unittest_part1.sh \ + src/test/unittest_part2.sh \ + src/test/unittest_part3.sh \ + src/test/unittest_part4.sh \ + src/test/unittest_part5.sh \ + src/test/unittest_part6.sh \ + src/test/unittest_part7.sh \ + src/test/unittest_part8.sh if USEPYTHON TESTSCRIPTS += \ @@ -51,7 +51,7 @@ endif if USE_PERL TESTSCRIPTS += \ - scripts/maint/checkSpaceTest.sh + scripts/maint/checkSpaceTest.sh endif TESTS += src/test/test-slow src/test/test-memwipe \ @@ -103,8 +103,8 @@ endif src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ - -DBINDIR="\"$(bindir)\"" \ - -DTOR_UNIT_TESTS \ + -DBINDIR="\"$(bindir)\"" \ + -DTOR_UNIT_TESTS \ $(AM_CPPFLAGS) # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. @@ -162,7 +162,7 @@ src_test_test_SOURCES += \ src/test/test_crypto.c \ src/test/test_crypto_ope.c \ src/test/test_crypto_rng.c \ - src/test/test_crypto_cgo.c \ + src/test/test_crypto_cgo.c \ src/test/test_data.c \ src/test/test_dir.c \ src/test/test_dirauth_ports.c \ @@ -337,7 +337,7 @@ src_test_test_memwipe_LDFLAGS = $(src_test_test_LDFLAGS) @CFLAGS_BUGTRAP@ src_test_bench_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \ @TOR_LDFLAGS_libevent@ src_test_bench_LDADD = \ - libtor.a \ + libtor.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ @CURVE25519_LIBS@ \ @@ -406,11 +406,10 @@ src_test_test_hs_ntor_cl_LDADD = \ libtor.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ - @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ + @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ $(AM_CPPFLAGS) - if UNITTESTS_ENABLED noinst_PROGRAMS += src/test/test-bt-cl src_test_test_bt_cl_SOURCES = src/test/test_bt_cl.c @@ -418,7 +417,7 @@ src_test_test_bt_cl_LDADD = \ $(TOR_UTIL_TESTING_LIBS) \ @TOR_LIB_MATH@ \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @TOR_TRACE_LIBS@ + @TOR_TRACE_LIBS@ src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS) endif @@ -440,7 +439,8 @@ EXTRA_DIST += \ src/test/test_keygen.sh \ src/test/test_key_expiration.sh \ src/test/test_zero_length_keys.sh \ - src/test/test_ntor.sh src/test/test_hs_ntor.sh src/test/test_bt.sh \ + src/test/test_ntor.sh src/test/test_hs_ntor.sh \ + src/test/test_bt.sh \ src/test/test-network.sh \ src/test/test_switch_id.sh \ src/test/test_workqueue_cancel.sh \ @@ -451,11 +451,11 @@ EXTRA_DIST += \ src/test/test_workqueue_socketpair.sh \ src/test/test_cmdline.sh \ src/test/test_parseconf.sh \ - src/test/unittest_part1.sh \ - src/test/unittest_part2.sh \ - src/test/unittest_part3.sh \ - src/test/unittest_part4.sh \ - src/test/unittest_part5.sh \ - src/test/unittest_part6.sh \ - src/test/unittest_part7.sh \ - src/test/unittest_part8.sh + src/test/unittest_part1.sh \ + src/test/unittest_part2.sh \ + src/test/unittest_part3.sh \ + src/test/unittest_part4.sh \ + src/test/unittest_part5.sh \ + src/test/unittest_part6.sh \ + src/test/unittest_part7.sh \ + src/test/unittest_part8.sh diff --git a/src/tools/include.am b/src/tools/include.am index 86cd0acbfd..2a5cb58549 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -9,7 +9,7 @@ src_tools_tor_resolve_LDFLAGS = @TOR_LDFLAGS_openssl@ src_tools_tor_resolve_LDADD = \ src/trunnel/libor-trunnel.a \ $(TOR_UTIL_LIBS) \ - $(TOR_CRYPTO_LIBS) $(TOR_LIBS_CRYPTLIB)\ + $(TOR_CRYPTO_LIBS) $(TOR_LIBS_CRYPTLIB)\ @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_USERENV@ if COVERAGE_ENABLED @@ -41,8 +41,8 @@ src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cer src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ src_tools_tor_print_ed_signing_cert_LDADD = \ src/trunnel/libor-trunnel.a \ - $(TOR_CRYPTO_LIBS) \ - $(TOR_UTIL_LIBS) \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @@ -66,6 +66,6 @@ endif if BUILD_LIBTORRUNNER noinst_LIBRARIES += src/tools/libtorrunner.a src_tools_libtorrunner_a_SOURCES = \ - src/tools/tor_runner.c \ - src/feature/api/tor_api.c + src/tools/tor_runner.c \ + src/feature/api/tor_api.c endif diff --git a/src/trunnel/include.am b/src/trunnel/include.am index 8bb2c385e5..973ceac80b 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -18,47 +18,47 @@ TRUNNELINPUTS = \ src/trunnel/socks5.trunnel \ src/trunnel/circpad_negotiation.trunnel \ src/trunnel/conflux.trunnel \ - src/trunnel/subproto_request.trunnel + src/trunnel/subproto_request.trunnel TRUNNELSOURCES = \ src/ext/trunnel/trunnel.c \ src/trunnel/ed25519_cert.c \ src/trunnel/extension.c \ src/trunnel/link_handshake.c \ - src/trunnel/pwbox.c \ - src/trunnel/hs/cell_establish_intro.c \ + src/trunnel/pwbox.c \ + src/trunnel/hs/cell_establish_intro.c \ src/trunnel/hs/cell_introduce1.c \ src/trunnel/hs/cell_rendezvous.c \ src/trunnel/channelpadding_negotiation.c \ - src/trunnel/sendme_cell.c \ - src/trunnel/flow_control_cells.c \ - src/trunnel/congestion_control.c \ + src/trunnel/sendme_cell.c \ + src/trunnel/flow_control_cells.c \ + src/trunnel/congestion_control.c \ src/trunnel/socks5.c \ src/trunnel/netinfo.c \ src/trunnel/circpad_negotiation.c \ src/trunnel/conflux.c \ - src/trunnel/subproto_request.c + src/trunnel/subproto_request.c TRUNNELHEADERS = \ - src/ext/trunnel/trunnel.h \ - src/ext/trunnel/trunnel-impl.h \ - src/trunnel/trunnel-local.h \ - src/trunnel/ed25519_cert.h \ + src/ext/trunnel/trunnel.h \ + src/ext/trunnel/trunnel-impl.h \ + src/trunnel/trunnel-local.h \ + src/trunnel/ed25519_cert.h \ src/trunnel/extension.h \ - src/trunnel/link_handshake.h \ - src/trunnel/pwbox.h \ - src/trunnel/hs/cell_establish_intro.h \ + src/trunnel/link_handshake.h \ + src/trunnel/pwbox.h \ + src/trunnel/hs/cell_establish_intro.h \ src/trunnel/hs/cell_introduce1.h \ src/trunnel/hs/cell_rendezvous.h \ src/trunnel/channelpadding_negotiation.h \ - src/trunnel/sendme_cell.h \ - src/trunnel/flow_control_cells.h \ - src/trunnel/congestion_control.h \ - src/trunnel/socks5.h \ + src/trunnel/sendme_cell.h \ + src/trunnel/flow_control_cells.h \ + src/trunnel/congestion_control.h \ + src/trunnel/socks5.h \ src/trunnel/netinfo.h \ src/trunnel/circpad_negotiation.h \ src/trunnel/conflux.h \ - src/trunnel/subproto_request.h + src/trunnel/subproto_request.h src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = \