Clean up new poll code slightly

Change-Id: I046126ff69a77a50e79efb1b6ebb0fffef67ac8e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 4 insertions, 26 deletions

diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 98fdf2fff2..ba987007d3 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -283,20 +283,9 @@ void QLocalServerPrivate::_q_onNewConnection()
 
 void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
 {
-    struct timespec tv, *ptv = nullptr;
+    pollfd pfd = qt_make_pollfd(listenSocket, POLLIN);
 
-    if (msec >= 0) {
-        tv.tv_sec = msec / 1000;
-        tv.tv_nsec = (msec % 1000) * 1000 * 1000;
-        ptv = &tv;
-    }
-
-    struct pollfd pfd;
-    pfd.fd = listenSocket;
-    pfd.events = POLLIN;
-    pfd.revents = 0;
-
-    switch (qt_safe_poll(&pfd, 1, ptv)) {
+    switch (qt_poll_msecs(&pfd, 1, msec)) {
     case 0:
         if (timedOut)
             *timedOut = true;
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;