diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-16 22:15:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-16 22:15:14 +0000 |
| commit | b837191fd0e897cbc5fc33874190bab8bbb83268 (patch) | |
| tree | 96b7bf77047a1873c56931c4f1387cd3c36f79c8 /src/or/router.c | |
| parent | e043b86f47185e0d9df53dab12d42e46c8c35b83 (diff) | |
| download | tor-b837191fd0e897cbc5fc33874190bab8bbb83268.tar tor-b837191fd0e897cbc5fc33874190bab8bbb83268.tar.gz | |
r12768@catbus: nickm | 2007-05-16 17:25:33 -0400
Fix GCC warnings related to local parameters/variables getting shadowed.
svn:r10198
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index d510b9328..3328ce77d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1321,11 +1321,11 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, if (router->declared_family && smartlist_len(router->declared_family)) { size_t n; - char *s = smartlist_join_strings(router->declared_family, " ", 0, &n); + char *family = smartlist_join_strings(router->declared_family, " ", 0, &n); n += strlen("family ") + 2; /* 1 for \n, 1 for \0. */ family_line = tor_malloc(n); - tor_snprintf(family_line, n, "family %s\n", s); - tor_free(s); + tor_snprintf(family_line, n, "family %s\n", family); + tor_free(family); } else { family_line = tor_strdup(""); } |