make event_assign void; it cannot return an error

svn:r763

diff --git a/event.c b/event.c
index 729ac8f70cc5c7ab1e60094240385338dbf138ab..0078da6d6a49079a7c693a643db6a6483809415c 100644 (file)
--- a/event.c
+++ b/event.c
@@ -623,7 +623,7 @@ event_base_once(struct event_base *base, evutil_socket_t fd, short events,
 {
        struct event_once *eonce;
        struct timeval etv;
-       int res;
+       int res = 0;
 
        /* We cannot support signals that just fire once */
        if (events & EV_SIGNAL)
@@ -641,11 +641,11 @@ event_base_once(struct event_base *base, evutil_socket_t fd, short events,
                        tv = &etv;
                }
 
-               res = evtimer_assign(&eonce->ev, base, event_once_cb, eonce);
+               evtimer_assign(&eonce->ev, base, event_once_cb, eonce);
        } else if (events & (EV_READ|EV_WRITE)) {
                events &= EV_READ|EV_WRITE;
 
-               res = event_assign(&eonce->ev, base, fd, events, event_once_cb, eonce);
+               event_assign(&eonce->ev, base, fd, events, event_once_cb, eonce);
        } else {
                /* Bad event combination */
                mm_free(eonce);
@@ -707,14 +707,12 @@ event_base_set(struct event_base *base, struct event *ev)
        return (0);
 }
 
-int
+void
 event_assign(struct event *ev, struct event_base *base, evutil_socket_t fd, short events, void (*cb)(evutil_socket_t, short, void *), void *arg)
 {
        event_set(ev, fd, events, cb, arg);
-       if (base)
-               return event_base_set(base, ev);
-       else
-               return (0);
+       if (base != NULL)
+               assert(event_base_set(base, ev) == 0);
 }
 
 void
@@ -732,13 +730,11 @@ event_new(struct event_base *base, evutil_socket_t fd, short events, void (*cb)(
 {
        struct event *ev;
        ev = mm_malloc(sizeof(struct event));
-       if (!ev)
-               return NULL;
-       if (event_assign(ev, base, fd, events, cb, arg) < 0) {
-               mm_free(ev);
-               return NULL;
-       }
-       return ev;
+       if (ev == NULL)
+               return (NULL);
+       event_assign(ev, base, fd, events, cb, arg);
+
+       return (ev);
 }
 
 void

diff --git a/include/event2/event.h b/include/event2/event.h
index 840092cbb17794f6147919e6fffbe7051e154ea6..4eaf66b2361c53dd53cddb61695b21c5e254e3dc 100644 (file)
--- a/include/event2/event.h
+++ b/include/event2/event.h
@@ -326,7 +326,7 @@ void event_set(struct event *, evutil_socket_t, short, void (*)(evutil_socket_t,
   @see event_add(), event_del(), event_once()
 
   */
-int event_assign(struct event *, struct event_base *, evutil_socket_t, short, void (*)(evutil_socket_t, short, void *), void *);
+void event_assign(struct event *, struct event_base *, evutil_socket_t, short, void (*)(evutil_socket_t, short, void *), void *);
 
 /**
   Create and allocate a new event structure, ready to be added.