cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 21:10:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

make event_assign void; it cannot return an error

Browse Source 
svn:r763
This commit is contained in:
Niels Provos 2008-05-03 22:14:44 +00:00
parent 1d30750b1d
commit 181007b9cf
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
event.c
View File

@ -623,7 +623,7 @@ event_base_once(struct event_base *base, evutil_socket_t fd, short events,
{ {
struct event_once *eonce; struct event_once *eonce;
struct timeval etv; struct timeval etv;
int res; int res = 0;
/* We cannot support signals that just fire once */ /* We cannot support signals that just fire once */
if (events & EV_SIGNAL) if (events & EV_SIGNAL)
@ -641,11 +641,11 @@ event_base_once(struct event_base *base, evutil_socket_t fd, short events,
tv = &etv; 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)) { } else if (events & (EV_READ|EV_WRITE)) {
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 { } else {
/* Bad event combination */ /* Bad event combination */
mm_free(eonce); mm_free(eonce);
@ -707,14 +707,12 @@ event_base_set(struct event_base *base, struct event *ev)
return (0); 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_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); event_set(ev, fd, events, cb, arg);
if (base) if (base != NULL)
return event_base_set(base, ev); assert(event_base_set(base, ev) == 0);
else
return (0);
} }
void void
@ -732,13 +730,11 @@ event_new(struct event_base *base, evutil_socket_t fd, short events, void (*cb)(
{ {
struct event *ev; struct event *ev;
ev = mm_malloc(sizeof(struct event)); ev = mm_malloc(sizeof(struct event));
if (!ev) if (ev == NULL)
return NULL; return (NULL);
if (event_assign(ev, base, fd, events, cb, arg) < 0) { event_assign(ev, base, fd, events, cb, arg);
mm_free(ev);
return NULL; return (ev);
}
return ev;
} }
void void

2
include/event2/event.h
View File

@ -326,7 +326,7 @@ void event_set(struct event *, evutil_socket_t, short, void (*)(evutil_socket_t,
@see event_add(), event_del(), event_once() @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. Create and allocate a new event structure, ready to be added.