diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 14:19:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 06:58:44 -0400 |
| commit | 47573038736b96e2a353a25ed3c788dcb77d8fcb (patch) | |
| tree | 20b95e3228fd153eead07944848c8cd62367d1ed /src/test/test_dns.c | |
| parent | 1135405c8c6ea315cd035171770a6701edae57f0 (diff) | |
| download | tor-47573038736b96e2a353a25ed3c788dcb77d8fcb.tar.gz tor-47573038736b96e2a353a25ed3c788dcb77d8fcb.zip | |
Fix all -Wshadow warnings on Linux
This is a partial fix for 18902.
Diffstat (limited to 'src/test/test_dns.c')
| -rw-r--r-- | src/test/test_dns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 5289ca58ff..8346c0a33f 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -52,7 +52,7 @@ NS(test_main)(void *arg) static int resolve_retval = 0; static int resolve_made_conn_pending = 0; static char *resolved_name = NULL; -static cached_resolve_t *cache_entry = NULL; +static cached_resolve_t *cache_entry_mock = NULL; static int n_fake_impl = 0; @@ -85,8 +85,8 @@ NS(dns_resolve_impl)(edge_connection_t *exitconn, int is_resolve, if (hostname_out && resolved_name) *hostname_out = tor_strdup(resolved_name); - if (resolve_out && cache_entry) - *resolve_out = cache_entry; + if (resolve_out && cache_entry_mock) + *resolve_out = cache_entry_mock; n_fake_impl++; @@ -213,7 +213,7 @@ NS(test_main)(void *arg) exitconn->on_circuit = &(on_circuit->base_); - cache_entry = fake_resolved; + cache_entry_mock = fake_resolved; prev_n_send_resolved_cell_replacement = n_send_resolved_cell_replacement; |