From bb747268ed89af8f034132fa46e30998b72a7ba9 Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Wed, 3 Feb 2016 19:09:00 -0800 Subject: Clean up new poll code slightly Change-Id: I046126ff69a77a50e79efb1b6ebb0fffef67ac8e Reviewed-by: Thiago Macieira --- src/network/socket/qnativesocketengine_unix.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/network/socket/qnativesocketengine_unix.cpp') diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index ed94808a54..1a3e2a5cae 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -1209,18 +1209,7 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool checkWrite, bool *selectForRead, bool *selectForWrite) const { - struct timespec tv, *ptv = nullptr; - - if (timeout >= 0) { - tv.tv_sec = timeout / 1000; - tv.tv_nsec = (timeout % 1000) * 1000 * 1000; - ptv = &tv; - } - - struct pollfd pfd; - pfd.fd = socketDescriptor; - pfd.events = 0; - pfd.revents = 0; + pollfd pfd = qt_make_pollfd(socketDescriptor, 0); if (checkRead) pfd.events |= POLLIN; @@ -1228,7 +1217,7 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c if (checkWrite) pfd.events |= POLLOUT; - const int ret = qt_safe_poll(&pfd, 1, ptv); + const int ret = qt_poll_msecs(&pfd, 1, timeout); if (ret <= 0) return ret; -- cgit v1.2.3