config: Styling fix + use fmt_addr()

Conform to C99 as suggested by nickm on #32888 and use fmt_addr() rather
than tor_addr_to_str_dup()
This commit is contained in:
c 2020-06-04 13:15:27 +00:00
parent 1934e399af
commit 8b568b50a5
No known key found for this signature in database
GPG Key ID: D43E2CA907AFA983

View File

@ -1693,16 +1693,12 @@ get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr))
/* Find the first non-internal address, or the last internal address /* Find the first non-internal address, or the last internal address
* Ideally, we want the default route, see #12377 for details */ * Ideally, we want the default route, see #12377 for details */
SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) { SMARTLIST_FOREACH_BEGIN(addrs, tor_addr_t *, a) {
char *addr_str;
int is_internal;
tor_addr_copy(addr, a); tor_addr_copy(addr, a);
is_internal = tor_addr_is_internal(a, 0); const bool is_internal = tor_addr_is_internal(a, 0);
rv = 0; rv = 0;
addr_str = tor_addr_to_str_dup(addr);
log_debug(LD_NET, "Found %s interface address '%s'", log_debug(LD_NET, "Found %s interface address '%s'",
(is_internal ? "internal" : "external"), addr_str); (is_internal ? "internal" : "external"), fmt_addr(addr));
tor_free(addr_str);
/* If we found a non-internal address, declare success. Otherwise, /* If we found a non-internal address, declare success. Otherwise,
* keep looking. */ * keep looking. */