diff options
author | bz <bz@FreeBSD.org> | 2007-11-28 20:38:05 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2007-11-28 20:38:05 +0000 |
commit | a7b5a34d5726074403f975ea323110456ba459ef (patch) | |
tree | 9a5f4d29f18e7c83b2df4c13a175a7a7ef88bc03 /tools/regression/netinet | |
parent | 479ef69e28a29f87e0e593edd116dd8dfb8211db (diff) | |
download | FreeBSD-src-a7b5a34d5726074403f975ea323110456ba459ef.zip FreeBSD-src-a7b5a34d5726074403f975ea323110456ba459ef.tar.gz |
Convert errx(-1, ..., strerror(errno)) to err(-1, ...).
Discussed with: rwatson
Diffstat (limited to 'tools/regression/netinet')
-rw-r--r-- | tools/regression/netinet/tcpconnect/tcpconnect.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/regression/netinet/tcpconnect/tcpconnect.c b/tools/regression/netinet/tcpconnect/tcpconnect.c index bce9b97..b9942d1 100644 --- a/tools/regression/netinet/tcpconnect/tcpconnect.c +++ b/tools/regression/netinet/tcpconnect/tcpconnect.c @@ -74,13 +74,13 @@ tcpconnect_server(int argc, char *argv[]) listen_sock = socket(PF_INET, SOCK_STREAM, 0); if (listen_sock == -1) - errx(-1, "socket: %s", strerror(errno)); + err(-1, "socket"); if (bind(listen_sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) - errx(-1, "bind: %s", strerror(errno)); + err(-1, "bind"); if (listen(listen_sock, -1) == -1) - errx(-1, "listen: %s", strerror(errno)); + err(-1, "listen"); while (1) { accept_sock = accept(listen_sock, NULL, NULL); @@ -110,7 +110,7 @@ tcpconnect_client(int argc, char *argv[]) sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; if (inet_aton(argv[0], &sin.sin_addr) == 0) - errx(-1, "listen: %x", strerror(errno)); + err(-1, "listen"); port = strtoul(argv[1], &dummy, 10); if (port < 1 || port > 65535 || *dummy != '\0') @@ -124,7 +124,7 @@ tcpconnect_client(int argc, char *argv[]) for (i = 0; i < count; i++) { sock = socket(PF_INET, SOCK_STREAM, 0); if (sock == -1) - errx(-1, "socket: %s", strerror(errno)); + err(-1, "socket"); /* No warning in default case on ENOPROTOOPT. */ if (setsockopt(sock, IPPROTO_TCP, TCP_MD5SIG, @@ -137,15 +137,15 @@ tcpconnect_client(int argc, char *argv[]) if (nonblock) { if (fcntl(sock, F_SETFL, O_NONBLOCK) != 0) - errx(-1, "fcntl(F_SETFL): %s", strerror(errno)); + err(-1, "fcntl(F_SETFL)"); if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1 && errno != EINPROGRESS) - errx(-1, "connect: %s", strerror(errno)); + err(-1, "connect"); } else { if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) - errx(-1, "connect: %s", strerror(errno)); + err(-1, "connect"); } close(sock); |