[ViewVC] Diff of: cvs/libev/event.c

Comparing libev/event.c (file contents):
Revision 1.18 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.20 by root, Tue Nov 6 18:49:32 2007 UTC

 }
 static void
 x_cb_sig (EV_P_ struct ev_signal *w, int revents)
 {
-  x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
+  struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
+  if (revents & EV_ERROR)
+    event_del (ev);
+  x_cb (ev, revents);
 }
 static void
 x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
+  if (revents & EV_ERROR)
+    event_del (ev);
-  if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
+  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
     ev_io_stop (EV_A_ w);
   x_cb (ev, revents);
 }
 };
 static void
 x_once_cb (int revents, void *arg)
 {
-  struct x_once *once = arg;
+  struct x_once *once = (struct x_once *)arg;
   once->cb (once->fd, revents, once->arg);
   free (once);
 }
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
 {
-  struct x_once *once = malloc (sizeof (struct x_once));
+  struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
   dLOOPbase;
   if (!once)
     return -1;

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