susv3 specifies rounding behaviour to go up, so screw broken osses

[software/libev.git] / ev_kqueue.c

diff --git a/ev_kqueue.c b/ev_kqueue.c
index afd3f9c402d248e71218d89c88ba2d5e23cc23ac..3103db1dd711a3867311366430b5a839ca9e1d45 100644 (file)
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -83,7 +83,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   if (kqueue_changecnt > kqueue_eventmax)
     {
       ev_free (kqueue_events);
   if (kqueue_changecnt > kqueue_eventmax)
     {
       ev_free (kqueue_events);

-      kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);

       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 
       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 


@@ -92,7 +92,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 

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

     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");
     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");


@@ -137,7 +137,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   if (expect_false (res == kqueue_eventmax))
     {
       ev_free (kqueue_events);
   if (expect_false (res == kqueue_eventmax))
     {
       ev_free (kqueue_events);

-      kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_eventmax + 1);

       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 }
       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 }