summaryrefslogtreecommitdiff
path: root/src/or/shared_random.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-28 10:22:10 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-28 10:22:10 -0400
commit9fe6fea1cceb39fc415ad813020bbd863121e0c9 (patch)
tree0437c4df402c6b7128d67e8c34d981bdd656b400 /src/or/shared_random.c
parent0390e1a60cb91fa581ec568879bf300224db6322 (diff)
downloadtor-9fe6fea1cceb39fc415ad813020bbd863121e0c9.tar.gz
tor-9fe6fea1cceb39fc415ad813020bbd863121e0c9.zip
Fix a huge pile of -Wshadow warnings.
These appeared on some of the Jenkins platforms. Apparently some GCCs care when you shadow globals, and some don't.
Diffstat (limited to 'src/or/shared_random.c')
-rw-r--r--src/or/shared_random.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/shared_random.c b/src/or/shared_random.c
index c9886d92b0..0a1f24a974 100644
--- a/src/or/shared_random.c
+++ b/src/or/shared_random.c
@@ -115,16 +115,16 @@ static int32_t num_srv_agreements_from_vote;
STATIC sr_srv_t *
srv_dup(const sr_srv_t *orig)
{
- sr_srv_t *dup = NULL;
+ sr_srv_t *duplicate = NULL;
if (!orig) {
return NULL;
}
- dup = tor_malloc_zero(sizeof(sr_srv_t));
- dup->num_reveals = orig->num_reveals;
- memcpy(dup->value, orig->value, sizeof(dup->value));
- return dup;
+ duplicate = tor_malloc_zero(sizeof(sr_srv_t));
+ duplicate->num_reveals = orig->num_reveals;
+ memcpy(duplicate->value, orig->value, sizeof(duplicate->value));
+ return duplicate;
}
/* Allocate a new commit object and initializing it with <b>rsa_identity</b>