From fc9a44e24299386b26f610a204656e30885c1ab5 Mon Sep 17 00:00:00 2001 From: JuanJo Ciarlante Date: Mon, 5 Oct 2009 12:24:20 +0200 Subject: [PATCH] * socket.c: better buf logic in print_sockaddr_ex --- socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/socket.c b/socket.c index 2bb7141a6..943cb5824 100644 --- a/socket.c +++ b/socket.c @@ -2382,7 +2382,7 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr, const unsigned int flags, struct gc_arena *gc) { - struct buffer out; + struct buffer out = alloc_buf_gc (128, gc); bool addr_is_defined; if (!addr) { return "[NULL]"; @@ -2395,7 +2395,6 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr, #endif { const int port= ntohs (addr->addr.in4.sin_port); - out = alloc_buf_gc (128, gc); buf_puts (&out, "[AF_INET]"); mutex_lock_static (L_INET_NTOA); buf_puts (&out, (addr_is_defined ? inet_ntoa (addr->addr.in4.sin_addr) : "[undef]")); @@ -2416,7 +2415,6 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr, { const int port= ntohs (addr->addr.in6.sin6_port); char buf[INET6_ADDRSTRLEN] = "[undef]"; - out = alloc_buf_gc (128, gc); buf_puts (&out, "[AF_INET6]"); if (addr_is_defined) { @@ -2434,6 +2432,8 @@ print_sockaddr_ex (const struct openvpn_sockaddr *addr, } } break; + default: + ASSERT(0); } #endif return BSTR (&out); -- 2.47.3