X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/4ee0973144c5b6c7cf136b1256e7ce9cb802e682..08f366939c60afffe3eb0bf658f52a607c8bb693:/event.c

diff --git a/event.c b/event.c
index 0fc6850..520e336 100644
--- a/event.c
+++ b/event.c
@@ -144,7 +144,12 @@ x_cb (struct event *ev, int revents)
 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
@@ -152,7 +157,9 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
 
-  if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
+  if (revents & EV_ERROR)
+    event_del (ev);
+  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
     ev_io_stop (EV_A_ w);
 
   x_cb (ev, revents);
@@ -332,7 +339,7 @@ struct x_once
 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);
@@ -340,7 +347,7 @@ x_once_cb (int revents, void *arg)
 
 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)