fix some aliasing issues again

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index 52fe42d129620fd099f772d3fd9160dbdfdc8bdd..d609833e291e21f40d91846ddc9e6b7e0f8269b2 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -31,7 +31,7 @@
 
 #include <poll.h>
 
 
 #include <poll.h>
 

-static void
+void inline_size

 pollidx_init (int *base, int count)
 {
   while (count--)
 pollidx_init (int *base, int count)
 {
   while (count--)


@@ -67,7 +67,7 @@ poll_modify (EV_P_ int fd, int oev, int nev)
     {
       pollidxs [fd] = -1;
 
     {
       pollidxs [fd] = -1;
 

-      if (idx < --pollcnt)
+      if (expect_true (idx < --pollcnt))

         {
           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;
         {
           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;


@@ -81,7 +81,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
   int i;
   int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
 
   int i;
   int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
 

-  if (res < 0)
+  if (expect_false (res < 0))

     {
       if (errno == EBADF)
         fd_ebadf (EV_A);
     {
       if (errno == EBADF)
         fd_ebadf (EV_A);


@@ -94,7 +94,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
     }
 
   for (i = 0; i < pollcnt; ++i)
     }
 
   for (i = 0; i < pollcnt; ++i)

-    if (polls [i].revents & POLLNVAL)
+    if (expect_false (polls [i].revents & POLLNVAL))

       fd_kill (EV_A_ polls [i].fd);
     else
       fd_event (
       fd_kill (EV_A_ polls [i].fd);
     else
       fd_event (


@@ -108,7 +108,7 @@ poll_poll (EV_P_ ev_tstamp timeout)
 int inline_size
 poll_init (EV_P_ int flags)
 {
 int inline_size
 poll_init (EV_P_ int flags)
 {

-  backend_fudge  = 1e-3; /* needed to compensate for select returning early, very conservative */
+  backend_fudge  = 0.; /* posix says this is zero */

   backend_modify = poll_modify;
   backend_poll   = poll_poll;
 
   backend_modify = poll_modify;
   backend_poll   = poll_poll;