[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_kqueue.c (file contents):
Revision 1.1 by root, Fri Nov 2 20:59:15 2007 UTC vs.
Revision 1.2 by root, Fri Nov 2 21:17:30 2007 UTC

 }
 static void
 kqueue_init (struct event_base *base)
 {
+  struct kevent ch, ev;
   /* Initalize the kernel queue */
-  if ((kq_fd = kqueue ()) == -1)
+  if ((kq_fd = kqueue ()) < 0)
-    {
-      free (kqueueop);
-      return;
-    }
-  /* Initalize fields */
-  kq_changes = malloc (NEVENT * sizeof (struct kevent));
-  if (!kq_changes)
     return;
-  events = malloc (NEVENT * sizeof (struct kevent));
+  /* Check for Mac OS X kqueue bug. */
-  if (!events)
+  ch.ident  = -1;
-    {
+  ch.filter = EVFILT_READ;
-      free (kq_changes);
+  ch.flags  = EV_ADD;
-      return;
-    }
-  /* Check for Mac OS X kqueue bug. */
-  kq_changes [0].ident  = -1;
-  kq_changes [0].filter = EVFILT_READ;
-  kq_changes [0].flags  = EV_ADD;
   /*
    * If kqueue works, then kevent will succeed, and it will
    * stick an error in events[0]. If kqueue is broken, then
    * kevent will fail.
    */
-  if (kevent (kq_fd, kq_changes, 1, kq_events, NEVENT, NULL) != 1
+  if (kevent (kq_fd, &ch, 1, &ev, 1, 0) != 1
-      || kq_events[0].ident != -1
+      || ev.ident != -1
-      || kq_events[0].flags != EV_ERROR)
+      || ev.flags != EV_ERROR)
     {
       /* detected broken kqueue */
-      free (kq_changes);
-      free (kq_events);
       close (kq_fd);
       return;
     }
   ev_method     = EVMETHOD_KQUEUE;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines