diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-03 09:13:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-03 09:13:00 -0500 |
| commit | 1bc95633fbd9c27db87d81593242e85d08afe116 (patch) | |
| tree | 33749e7b0877764ad1d276ece69b97cb15de8df7 /src/or/hs_service.c | |
| parent | 451c852a0f75fe9ac6935851e763a948c1c5b197 (diff) | |
| download | tor-1bc95633fbd9c27db87d81593242e85d08afe116.tar.gz tor-1bc95633fbd9c27db87d81593242e85d08afe116.zip | |
Fix some shadowed-global warnings.
These are all about local variables shadowing global
functions. That isn't normally a problem, but at least one
compiler we care about seems to treat this as a case of -Wshadow
violation, so let's fix it.
Fixes bug 24634; bugfix on 0.3.2.1-alpha.
Diffstat (limited to 'src/or/hs_service.c')
| -rw-r--r-- | src/or/hs_service.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index dd836bf842..45810c5c5f 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1190,9 +1190,9 @@ setup_desc_intro_point(const ed25519_keypair_t *signing_kp, /* Copy link specifier(s). */ SMARTLIST_FOREACH_BEGIN(ip->base.link_specifiers, const hs_desc_link_specifier_t *, ls) { - hs_desc_link_specifier_t *dup = tor_malloc_zero(sizeof(*dup)); - link_specifier_copy(dup, ls); - smartlist_add(desc_ip->link_specifiers, dup); + hs_desc_link_specifier_t *copy = tor_malloc_zero(sizeof(*copy)); + link_specifier_copy(copy, ls); + smartlist_add(desc_ip->link_specifiers, copy); } SMARTLIST_FOREACH_END(ls); /* For a legacy intro point, we'll use an RSA/ed cross certificate. */ @@ -2276,15 +2276,15 @@ upload_descriptor_to_hsdir(const hs_service_t *service, /* Logging so we know where it was sent. */ { int is_next_desc = (service->desc_next == desc); - const uint8_t *index = (is_next_desc) ? hsdir->hsdir_index->store_second: - hsdir->hsdir_index->store_first; + const uint8_t *idx = (is_next_desc) ? hsdir->hsdir_index->store_second: + hsdir->hsdir_index->store_first; log_info(LD_REND, "Service %s %s descriptor of revision %" PRIu64 " initiated upload request to %s with index %s", safe_str_client(service->onion_address), (is_next_desc) ? "next" : "current", desc->desc->plaintext_data.revision_counter, safe_str_client(node_describe(hsdir)), - safe_str_client(hex_str((const char *) index, 32))); + safe_str_client(hex_str((const char *) idx, 32))); } /* XXX: Inform control port of the upload event (#20699). */ |