From f035178b0068f00c8fe5c30c9aeb08af7c4ce04c Mon Sep 17 00:00:00 2001 From: sourceturner <126549-sourceturner@users.noreply.gitlab.redox-os.org> Date: Sat, 6 Jun 2026 16:18:01 +0200 Subject: [PATCH] revert checks for presence of IPv6 related symbols --- tests/netdb/getaddrinfo.c | 12 ++---------- tests/sys_socket/getpeername.c | 10 +--------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/tests/netdb/getaddrinfo.c b/tests/netdb/getaddrinfo.c index 91af8fea59..4509463cf1 100644 --- a/tests/netdb/getaddrinfo.c +++ b/tests/netdb/getaddrinfo.c @@ -9,16 +9,10 @@ #include "test_helpers.h" -#ifdef INET6_ADDRSTRLEN -#define _ADDRSTRLEN INET6_ADDRSTRLEN -#else -#define _ADDRSTRLEN INET_ADDRSTRLEN -#endif - int main(void) { struct addrinfo hints, *res; int errcode; - char addrstr[_ADDRSTRLEN]; + char addrstr[INET6_ADDRSTRLEN]; void *ptr; memset(&hints, 0, sizeof(hints)); @@ -37,16 +31,14 @@ int main(void) { case AF_INET: ptr = &((struct sockaddr_in *) res->ai_addr)->sin_addr; break; -#ifdef AF_INET6 case AF_INET6: ptr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr; break; -#endif default: ptr = NULL; } if (ptr) { - inet_ntop(res->ai_family, ptr, addrstr, _ADDRSTRLEN); + inet_ntop(res->ai_family, ptr, addrstr, INET6_ADDRSTRLEN); printf( "IPv%d address: %s (%s)\n", diff --git a/tests/sys_socket/getpeername.c b/tests/sys_socket/getpeername.c index f2b758b9e7..98eb2fa28a 100644 --- a/tests/sys_socket/getpeername.c +++ b/tests/sys_socket/getpeername.c @@ -2,14 +2,8 @@ #include "test_helpers.h" -#ifdef INET6_ADDRSTRLEN -#define _ADDRSTRLEN INET6_ADDRSTRLEN -#else -#define _ADDRSTRLEN INET_ADDRSTRLEN -#endif - void print_sockaddr(char *ctx, struct sockaddr *addr) { - char ip_string[_ADDRSTRLEN]; + char ip_string[INET6_ADDRSTRLEN]; void *raw_ip_addr; char *fam; in_port_t port; @@ -19,13 +13,11 @@ void print_sockaddr(char *ctx, struct sockaddr *addr) { raw_ip_addr = &(ipv4->sin_addr); port = ntohs(ipv4->sin_port); fam = "AF_INET"; -#ifdef AF_INET6 } else if (addr->sa_family == AF_INET6) { struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr; raw_ip_addr = &(ipv6->sin6_addr); port = ntohs(ipv6->sin6_port); fam = "AF_INET6"; -#endif } else { printf("Unknown address family: %d\n", addr->sa_family); exit(1);