From c3cada0509cc4610b88662e555dbb329d7b7f1aa Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 11 Nov 2020 14:54:37 +0200 Subject: [PATCH] remove unused qt_safe_socket() and qt_safe_accept() arguments Signed-off-by: Ivailo Monev --- src/network/socket/qnet_unix_p.h | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h index 4672029e1..d564e654b 100644 --- a/src/network/socket/qnet_unix_p.h +++ b/src/network/socket/qnet_unix_p.h @@ -57,16 +57,11 @@ QT_BEGIN_NAMESPACE -// UnixWare 7 redefines socket -> _socket -static inline int qt_safe_socket(int domain, int type, int protocol, int flags = 0) +static inline int qt_safe_socket(int domain, int type, int protocol) { - Q_ASSERT((flags & ~O_NONBLOCK) == 0); - -#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) +#if defined(SOCK_CLOEXEC) // since Linux 2.6.27 int newtype = type | SOCK_CLOEXEC; - if (flags & O_NONBLOCK) - newtype |= SOCK_NONBLOCK; return ::socket(domain, newtype, protocol); #else int fd = ::socket(domain, type, protocol); @@ -74,41 +69,22 @@ static inline int qt_safe_socket(int domain, int type, int protocol, int flags = return -1; ::fcntl(fd, F_SETFD, FD_CLOEXEC); - - // set non-block too? - if (flags & O_NONBLOCK) - ::fcntl(fd, F_SETFL, ::fcntl(fd, F_GETFL) | O_NONBLOCK); - return fd; #endif } -// Tru64 redefines accept -> _accept with _XOPEN_SOURCE_EXTENDED -static inline int qt_safe_accept(int s, struct sockaddr *addr, QT_SOCKLEN_T *addrlen, int flags = 0) +static inline int qt_safe_accept(int s, struct sockaddr *addr, QT_SOCKLEN_T *addrlen) { - Q_ASSERT((flags & ~O_NONBLOCK) == 0); - -#if defined(Q_OS_LINUX) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) - int sockflags = SOCK_CLOEXEC; - if (flags & O_NONBLOCK) - sockflags |= SOCK_NONBLOCK; - return ::accept4(s, addr, addrlen, sockflags); -#elif defined(Q_OS_NETBSD) && defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK) - int sockflags = SOCK_CLOEXEC; - if (flags & O_NONBLOCK) - sockflags |= SOCK_NONBLOCK; - return ::paccept(s, addr, addrlen, NULL, sockflags); +#if defined(Q_OS_LINUX) && defined(SOCK_CLOEXEC) + return ::accept4(s, addr, addrlen, SOCK_CLOEXEC); +#elif defined(Q_OS_NETBSD) && defined(SOCK_CLOEXEC) + return ::paccept(s, addr, addrlen, NULL, SOCK_CLOEXEC); #else int fd = ::accept(s, addr, addrlen); if (fd == -1) return -1; ::fcntl(fd, F_SETFD, FD_CLOEXEC); - - // set non-block too? - if (flags & O_NONBLOCK) - ::fcntl(fd, F_SETFL, ::fcntl(fd, F_GETFL) | O_NONBLOCK); - return fd; #endif } -- 2.11.0