From 0c0ac807c18bec2af4323894e299520b026aa781 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 31 Aug 2020 16:02:09 +1000 Subject: [PATCH] roken: socket test style fixes Make error reporting in socket test programs consistent with other usages by removing redundant newline, using strerror() and reporting error in parentheses. --- lib/roken/getaddrinfo-test.c | 2 +- lib/roken/getifaddrs-test.c | 2 +- lib/roken/test-mini_inetd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/roken/getaddrinfo-test.c b/lib/roken/getaddrinfo-test.c index 9d33b2ec6..6bdc603fd 100644 --- a/lib/roken/getaddrinfo-test.c +++ b/lib/roken/getaddrinfo-test.c @@ -130,7 +130,7 @@ main(int argc, char **argv) } if (rk_SOCK_INIT()) - errx(1, "Couldn't initialize sockets. Err=%d\n", rk_SOCK_ERRNO); + errx(1, "Failed to initialize sockets (%s)", strerror(rk_SOCK_ERRNO)); argc -= optidx; argv += optidx; diff --git a/lib/roken/getifaddrs-test.c b/lib/roken/getifaddrs-test.c index 8d0725a68..252763df0 100644 --- a/lib/roken/getifaddrs-test.c +++ b/lib/roken/getifaddrs-test.c @@ -117,7 +117,7 @@ main(int argc, char **argv) } if (rk_SOCK_INIT()) - errx(1, "Couldn't initialize sockets. Err=%d\n", rk_SOCK_ERRNO); + errx(1, "Failed to initialize sockets (%s)", strerror(rk_SOCK_ERRNO)); ret = getifaddrs(&addrs); if (ret != 0) diff --git a/lib/roken/test-mini_inetd.c b/lib/roken/test-mini_inetd.c index b11447060..97f639e82 100644 --- a/lib/roken/test-mini_inetd.c +++ b/lib/roken/test-mini_inetd.c @@ -254,7 +254,7 @@ do_client(void) int rv = 0; if (rk_SOCK_INIT()) - errx(1, "Couldn't initialize sockets. Err=%d\n", rk_SOCK_ERRNO); + errx(1, "Failed to initialize sockets (%s)", strerror(rk_SOCK_ERRNO)); prog = "Client"; is_client = 1; @@ -274,7 +274,7 @@ do_server(void) int rv = 0; if (rk_SOCK_INIT()) - errx(1, "Couldn't initialize sockets. Err=%d\n", rk_SOCK_ERRNO); + errx(1, "Failed to initialize sockets (%s)", strerror(rk_SOCK_ERRNO)); prog = "Server"; -- 2.11.4.GIT