From 92569b381b4f974bd3fdda0524b2b0bd2ce322e6 Mon Sep 17 00:00:00 2001 From: Aaron Lipinski Date: Tue, 6 Apr 2021 13:49:08 +1200 Subject: [PATCH] remove temporaries --- ui/mtr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/mtr.c b/ui/mtr.c index a8ccc0a..554264a 100644 --- a/ui/mtr.c +++ b/ui/mtr.c @@ -710,10 +710,6 @@ static int get_hostent_from_name( { int gai_error; struct addrinfo hints, *res; - struct sockaddr_in *sa4; -#ifdef ENABLE_IPV6 - struct sockaddr_in6 *sa6; -#endif /* gethostbyname2() is deprecated so we'll use getaddrinfo() instead. */ memset(&hints, 0, sizeof hints); @@ -738,13 +734,11 @@ static int get_hostent_from_name( host->h_length = res->ai_addrlen; switch (ctl->af) { case AF_INET: - sa4 = (struct sockaddr_in *) res->ai_addr; - host->h_addr_list[0] = (void *) &(sa4->sin_addr); + host->h_addr_list[0] = (char*)&((struct sockaddr_in *)res->ai_addr)->sin_addr; break; #ifdef ENABLE_IPV6 case AF_INET6: - sa6 = (struct sockaddr_in6 *) res->ai_addr; - host->h_addr_list[0] = (void *) &(sa6->sin6_addr); + host->h_addr_list[0] = (char*)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr; break; #endif default: -- 2.47.2