[tor-commits] [tor/master] Make dns_cancel_pending_resolve() STATIC.

[nickm@xxxxxxxxxxxxxx]

commit defd941fe7f28264effffbbffb487ee4383ca2ba
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 19 12:30:09 2020 -0500

    Make dns_cancel_pending_resolve() STATIC.
    
    It is not called by anything outside of the tests and dns.c.
---
 src/feature/relay/dns.c | 2 +-
 src/feature/relay/dns.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 3ff1378df..99f48ab2c 100644
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -1028,7 +1028,7 @@ connection_dns_remove(edge_connection_t *conn)
  * the resolve for <b>address</b> itself, and remove any cached results for
  * <b>address</b> from the cache.
  */
-MOCK_IMPL(void,
+MOCK_IMPL(STATIC void,
 dns_cancel_pending_resolve,(const char *address))
 {
   pending_connection_t *pend;
diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h
index 462cc6361..120b75bf8 100644
--- a/src/feature/relay/dns.h
+++ b/src/feature/relay/dns.h
@@ -19,7 +19,6 @@ int has_dns_init_failed(void);
 int dns_reset(void);
 void connection_dns_remove(edge_connection_t *conn);
 void assert_connection_edge_not_dns_pending(edge_connection_t *conn);
-MOCK_DECL(void,dns_cancel_pending_resolve,(const char *question));
 int dns_resolve(edge_connection_t *exitconn);
 int dns_seems_to_be_broken(void);
 int dns_seems_to_be_broken_for_ipv6(void);
@@ -78,6 +77,7 @@ size_t number_of_configured_nameservers(void);
 tor_addr_t *configured_nameserver_address(const size_t idx);
 #endif
 
+MOCK_DECL(STATIC void,dns_cancel_pending_resolve,(const char *question));
 MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn,
 int is_resolve,or_circuit_t *oncirc, char **hostname_out,
 int *made_connection_pending_out, cached_resolve_t **resolve_out));



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits