set event id in add_event rather than calling function

This commit is contained in:
Neil Cook 2016-12-14 17:04:09 +00:00
parent e9e6ff013b
commit c1d5ae9a25
1 changed files with 1 additions and 2 deletions

View File

@ -47,6 +47,7 @@ _getdns_eventloop_info *find_event(_getdns_eventloop_info** events, int id)
void add_event(_getdns_eventloop_info** events, int id, _getdns_eventloop_info* ev) void add_event(_getdns_eventloop_info** events, int id, _getdns_eventloop_info* ev)
{ {
DEBUG_SCHED("default_eventloop: add_event with id %d", id); DEBUG_SCHED("default_eventloop: add_event with id %d", id);
ev->id = id;
HASH_ADD_INT(*events, id, ev); HASH_ADD_INT(*events, id, ev);
} }
@ -115,7 +116,6 @@ default_eventloop_schedule(getdns_eventloop *loop,
free(fd_event); free(fd_event);
} }
fd_event = calloc(1, sizeof(_getdns_eventloop_info)); fd_event = calloc(1, sizeof(_getdns_eventloop_info));
fd_event->id = fd;
fd_event->event = event; fd_event->event = event;
fd_event->timeout_time = get_now_plus(timeout); fd_event->timeout_time = get_now_plus(timeout);
add_event(&default_loop->fd_events, fd, fd_event); add_event(&default_loop->fd_events, fd, fd_event);
@ -140,7 +140,6 @@ default_eventloop_schedule(getdns_eventloop *loop,
_getdns_eventloop_info* timeout_event = NULL; _getdns_eventloop_info* timeout_event = NULL;
if ((timeout_event = find_event(&default_loop->timeout_events, i)) == NULL) { if ((timeout_event = find_event(&default_loop->timeout_events, i)) == NULL) {
timeout_event = calloc(1, sizeof(_getdns_eventloop_info)); timeout_event = calloc(1, sizeof(_getdns_eventloop_info));
timeout_event->id = i;
timeout_event->event = event; timeout_event->event = event;
timeout_event->timeout_time = get_now_plus(timeout); timeout_event->timeout_time = get_now_plus(timeout);
add_event(&default_loop->timeout_events, i, timeout_event); add_event(&default_loop->timeout_events, i, timeout_event);