summaryrefslogtreecommitdiff
path: root/src/test/test_addr.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-28 06:59:03 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-28 06:59:03 -0400
commita8676b1edecee2d1d472b7f67dd026ef7b084a2f (patch)
treed9ba30676becb8e03bbceaae9ba19a8288a2eb1d /src/test/test_addr.c
parentf0488551e7be4e2d21a104903a86be993a240398 (diff)
parent47573038736b96e2a353a25ed3c788dcb77d8fcb (diff)
downloadtor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.tar.gz
tor-a8676b1edecee2d1d472b7f67dd026ef7b084a2f.zip
Merge branch 'bug18902_squashed'
Diffstat (limited to 'src/test/test_addr.c')
-rw-r--r--src/test/test_addr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index 337bddad6b..dcecb0b7dc 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -83,12 +83,12 @@ test_addr_basic(void *arg)
tt_assert_test_fmt_type(a,b,e1" "#op" "e2,struct in6_addr*, \
(memcmp(val1_->s6_addr, val2_->s6_addr, 16) op 0), \
char *, "%s", \
- { int i; char *cp; \
+ { char *cp; \
cp = print_ = tor_malloc(64); \
- for (i=0;i<16;++i) { \
+ for (int ii_=0;i<16;++i) { \
tor_snprintf(cp, 3,"%02x", (unsigned)value_->s6_addr[i]);\
cp += 2; \
- if (i != 15) *cp++ = ':'; \
+ if (ii_ != 15) *cp++ = ':'; \
} \
}, \
{ tor_free(print_); }, \