From 9ff471773884edf8a9630f7bf00f016a1950b3e7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 10 Aug 2017 19:47:40 +0200 Subject: system/fd_util: remove unused function accept_cloexec_nonblock() --- src/system/fd_util.c | 28 ---------------------------- src/system/fd_util.h | 8 -------- 2 files changed, 36 deletions(-) (limited to 'src/system') diff --git a/src/system/fd_util.c b/src/system/fd_util.c index 72c1e830c..b6ad0ebdb 100644 --- a/src/system/fd_util.c +++ b/src/system/fd_util.c @@ -128,34 +128,6 @@ pipe_cloexec_nonblock(int fd[2]) #endif } -int -accept_cloexec_nonblock(int fd, struct sockaddr *address, - size_t *address_length_r) -{ - int ret; - socklen_t address_length = *address_length_r; - -#ifdef HAVE_ACCEPT4 - ret = accept4(fd, address, &address_length, - SOCK_CLOEXEC|SOCK_NONBLOCK); - if (ret >= 0 || errno != ENOSYS) { - if (ret >= 0) - *address_length_r = address_length; - - return ret; - } -#endif - - ret = accept(fd, address, &address_length); - if (ret >= 0) { - fd_set_cloexec(ret, true); - fd_set_nonblock(ret); - *address_length_r = address_length; - } - - return ret; -} - int close_socket(int fd) { diff --git a/src/system/fd_util.h b/src/system/fd_util.h index 4442f32b4..b7cbd98ee 100644 --- a/src/system/fd_util.h +++ b/src/system/fd_util.h @@ -64,14 +64,6 @@ fd_set_cloexec(int fd, bool enable); int pipe_cloexec_nonblock(int fd[2]); -/** - * Wrapper for accept(), which sets the CLOEXEC and the NONBLOCK flags - * (atomically if supported by the OS). - */ -int -accept_cloexec_nonblock(int fd, struct sockaddr *address, - size_t *address_length_r); - /** * Portable wrapper for close(); use closesocket() on WIN32/WinSock. */ -- cgit v1.2.3