[tor-commits] [tor/master] Merge branch 'pre_formatter_cleanups_squashed'
nickm at torproject.org
nickm at torproject.org
Thu Jan 9 12:32:54 UTC 2020
commit e45810113b150533611c7d9cb5f0f264e00a7394
Merge: a48cb9fa4 8b2041c34
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Jan 9 07:32:39 2020 -0500
Merge branch 'pre_formatter_cleanups_squashed'
changes/ticket32764 | 9 ++
src/app/config/or_options_st.h | 39 +++---
src/core/crypto/hs_ntor.h | 4 +-
src/core/mainloop/.may_include | 2 +
src/core/mainloop/connection.h | 200 +++++++++++++++++-------------
src/core/or/.may_include | 4 +-
src/core/or/channel.h | 1 +
src/core/or/circuit_st.h | 1 +
src/core/or/scheduler.h | 3 +-
src/ext/ht.h | 3 +-
src/ext/siphash.h | 2 +
src/ext/tinytest_macros.h | 4 +-
src/feature/control/control_hs.h | 15 +--
src/feature/dirauth/authmode.c | 9 ++
src/feature/dirauth/authmode.h | 9 +-
src/feature/dirauth/keypin.h | 2 +
src/feature/dircache/conscache.h | 2 +
src/feature/dircache/consdiffmgr.h | 10 +-
src/feature/dirparse/routerparse.h | 1 +
src/feature/hs/hs_circuit.h | 5 +-
src/feature/hs/hs_circuitmap.h | 11 +-
src/feature/hs/hs_service.h | 2 +
src/feature/nodelist/microdesc_st.h | 2 +
src/feature/nodelist/node_st.h | 1 +
src/feature/relay/dns_structs.h | 3 +-
src/feature/stats/geoip_stats.h | 1 +
src/lib/cc/compat_compiler.h | 8 +-
src/lib/compress/compress_zstd.c | 4 +-
src/lib/conf/conftesting.h | 2 +
src/lib/crypt_ops/aes_nss.c | 4 +-
src/lib/crypt_ops/aes_openssl.c | 4 +-
src/lib/crypt_ops/crypto_dh_openssl.c | 4 +-
src/lib/crypt_ops/crypto_digest_nss.c | 4 +-
src/lib/crypt_ops/crypto_digest_openssl.c | 4 +-
src/lib/crypt_ops/crypto_nss_mgt.c | 4 +-
src/lib/crypt_ops/crypto_openssl_mgt.c | 4 +-
src/lib/crypt_ops/crypto_rand.c | 4 +-
src/lib/crypt_ops/crypto_rsa_nss.c | 2 +-
src/lib/crypt_ops/crypto_rsa_openssl.c | 4 +-
src/lib/crypt_ops/crypto_util.c | 4 +-
src/lib/evloop/timers.h | 1 +
src/lib/fdio/fdio.h | 3 +
src/lib/math/fp.c | 16 +--
src/lib/meminfo/meminfo.c | 4 +-
src/lib/process/process.h | 15 ++-
src/lib/tls/tortls_internal.h | 2 +
src/lib/tls/tortls_nss.c | 4 +-
src/lib/tls/tortls_openssl.c | 4 +-
src/lib/tls/x509_openssl.c | 4 +-
src/test/test_bt_cl.c | 4 +-
src/test/test_circuitlist.c | 2 +-
src/test/test_config.c | 8 +-
src/test/test_crypto.c | 4 +-
src/test/test_dir_handle_get.c | 6 +-
src/test/test_helpers.c | 4 +-
src/test/test_hs_descriptor.c | 4 +-
src/test/test_microdesc.c | 4 +-
src/test/test_tortls_openssl.c | 4 +-
src/tools/tor-gencert.c | 4 +-
59 files changed, 288 insertions(+), 210 deletions(-)
diff --cc src/core/or/scheduler.h
index 1a1429868,03cb45675..82df2b0b0
--- a/src/core/or/scheduler.h
+++ b/src/core/or/scheduler.h
@@@ -136,8 -136,10 +136,10 @@@ MOCK_DECL(void, scheduler_channel_has_w
* These functions are only visible to the scheduling system, the current
* scheduler implementation, and tests.
*****************************************************************************/
-#ifdef SCHEDULER_PRIVATE_
+#ifdef SCHEDULER_PRIVATE
+ #include "ext/ht.h"
+
/*********************************
* Defined in scheduler.c
*********************************/
@@@ -212,7 -214,6 +214,6 @@@ extern int32_t sched_run_interval
scheduler_t *get_vanilla_scheduler(void);
-#endif /* defined(SCHEDULER_PRIVATE_) */
+#endif /* defined(SCHEDULER_PRIVATE) */
#endif /* !defined(TOR_SCHEDULER_H) */
-
diff --cc src/feature/control/control_hs.h
index 8b9ebaba1,da96866f5..8a0cd6818
--- a/src/feature/control/control_hs.h
+++ b/src/feature/control/control_hs.h
@@@ -18,16 -20,15 +20,15 @@@ extern const struct control_cmd_syntax_
extern const struct control_cmd_syntax_t onion_client_auth_view_syntax;
int
- handle_control_onion_client_auth_add(control_connection_t *conn,
- const control_cmd_args_t *args);
+ handle_control_onion_client_auth_add(struct control_connection_t *conn,
+ const struct control_cmd_args_t *args);
int
- handle_control_onion_client_auth_remove(control_connection_t *conn,
- const control_cmd_args_t *args);
+ handle_control_onion_client_auth_remove(struct control_connection_t *conn,
+ const struct control_cmd_args_t *args);
int
- handle_control_onion_client_auth_view(control_connection_t *conn,
- const control_cmd_args_t *args);
+ handle_control_onion_client_auth_view(struct control_connection_t *conn,
+ const struct control_cmd_args_t *args);
-#endif
+#endif /* !defined(TOR_CONTROL_HS_H) */
-
diff --cc src/feature/dirparse/routerparse.h
index ca9250fa9,cedbfbf33..519044e9b
--- a/src/feature/dirparse/routerparse.h
+++ b/src/feature/dirparse/routerparse.h
@@@ -40,7 -40,8 +40,8 @@@ int find_single_ipv6_orport(const smart
void routerparse_init(void);
void routerparse_free_all(void);
-#ifdef EXPOSE_ROUTERDESC_TOKEN_TABLE
+#ifdef ROUTERDESC_TOKEN_TABLE_PRIVATE
+ #include "feature/dirparse/parsecommon.h"
extern const struct token_rule_t routerdesc_token_table[];
#endif
diff --cc src/lib/crypt_ops/aes_openssl.c
index 4ee22647d,ce386ac68..502f7703b
--- a/src/lib/crypt_ops/aes_openssl.c
+++ b/src/lib/crypt_ops/aes_openssl.c
@@@ -37,8 -37,9 +37,8 @@@ DISABLE_GCC_WARNING("-Wredundant-decls"
#include <openssl/engine.h>
#include <openssl/modes.h>
- ENABLE_GCC_WARNING(redundant-decls)
+ ENABLE_GCC_WARNING("-Wredundant-decls")
-#include "lib/crypt_ops/aes.h"
#include "lib/log/log.h"
#include "lib/ctime/di_ops.h"
More information about the tor-commits
mailing list