Sebastian Lackner : ws2_32: Improve implementation of get_poll_results.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d824b1ac3c874cb493d42eb7d0b8b998dc308897
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d824b1ac3c874cb493d42eb7d0b8b998dc308897

Author: Sebastian Lackner <sebastian at fds-team.de>
Date:   Sat Nov 29 11:18:18 2014 +0100

ws2_32: Improve implementation of get_poll_results.

---

 dlls/ws2_32/socket.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 142e964..ebafed5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4386,36 +4386,37 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd
 static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds,
                              const struct pollfd *fds )
 {
-    unsigned int exceptfds_off = (readfds ? readfds->fd_count : 0) + (writefds ? writefds->fd_count : 0);
-    unsigned int i, j = 0, k, total = 0;
+    const struct pollfd *poll_writefds  = fds + (readfds ? readfds->fd_count : 0);
+    const struct pollfd *poll_exceptfds = poll_writefds + (writefds ? writefds->fd_count : 0);
+    unsigned int i, k, total = 0;
 
     if (readfds)
     {
-        for (i = k = 0; i < readfds->fd_count; i++, j++)
+        for (i = k = 0; i < readfds->fd_count; i++)
         {
-
-            if (fds[j].revents ||
-                    (readfds==writefds &&  (fds[readfds->fd_count+i].revents & POLLOUT) &&
-                     !(fds[readfds->fd_count+i].revents & POLLHUP)) ||
-                    (readfds==exceptfds && fds[exceptfds_off+i].revents))
+            if (fds[i].revents ||
+                    (readfds == writefds && (poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) ||
+                    (readfds == exceptfds && poll_exceptfds[i].revents))
                 readfds->fd_array[k++] = readfds->fd_array[i];
         }
         readfds->fd_count = k;
         total += k;
     }
-    if (writefds && writefds!=readfds)
+    if (writefds && writefds != readfds)
     {
-        for (i = k = 0; i < writefds->fd_count; i++, j++)
-            if (((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) ||
-                    (writefds==exceptfds && fds[exceptfds_off+i].revents))
+        for (i = k = 0; i < writefds->fd_count; i++)
+        {
+            if (((poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) ||
+                    (writefds == exceptfds && poll_exceptfds[i].revents))
                 writefds->fd_array[k++] = writefds->fd_array[i];
+        }
         writefds->fd_count = k;
         total += k;
     }
-    if (exceptfds && exceptfds!=readfds && exceptfds!=writefds)
+    if (exceptfds && exceptfds != readfds && exceptfds != writefds)
     {
         for (i = k = 0; i < exceptfds->fd_count; i++)
-            if (fds[exceptfds_off+i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i];
+            if (poll_exceptfds[i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i];
         exceptfds->fd_count = k;
         total += k;
     }