[tor-commits] [tor/master] Don't shadow 'buf'.

[nickm at torproject.org]

commit dee4f068ee8be3d424aaa300168564f4abd18a36
Author: Linus Nordberg <linus at nordberg.se>
Date:   Thu May 31 18:34:12 2012 +0200

    Don't shadow 'buf'.
---
 src/or/dirserv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 6f16469..7020d5b 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2091,10 +2091,10 @@ routerstatus_format_entry(char *buf, size_t buf_len,
 
   /* Possible "a" line, not included in consensus for now. */
   if (!tor_addr_is_null(&rs->ipv6_addr)) {
-    char buf[TOR_ADDR_BUF_LEN];
+    const char *addr_str = fmt_and_decorate_addr(&rs->ipv6_addr);
     r = tor_snprintf(cp, buf_len - (cp-buf),
                      "a %s:%d\n",
-                     tor_addr_to_str(buf, &rs->ipv6_addr, sizeof(buf), 1),
+                     addr_str,
                      (int)rs->ipv6_orport);
     if (r<0) {
       log_warn(LD_BUG, "Not enough space in buffer.");