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

Comparing libev/event.c (file contents):
Revision 1.19 by root, Tue Nov 6 16:51:20 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);
 }

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