diff options
| author | Roy Marples <roy@marples.name> | 2015-05-14 07:35:49 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2015-05-14 07:35:49 +0000 |
| commit | 58bbb46ee769fde699f96378d310d086d1260ccf (patch) | |
| tree | ed81a6fb33ae76fb75802295053eb592e50e77f7 /dhcpcd.c | |
| parent | 1b854ddddb3191010ebc8c1db3521613fbe40e01 (diff) | |
| download | dhcpcd-58bbb46ee769fde699f96378d310d086d1260ccf.tar.xz | |
Improve eloop api so we don't force a delete write parameter when
deleting events.
Diffstat (limited to 'dhcpcd.c')
| -rw-r--r-- | dhcpcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -871,7 +871,7 @@ handle_link(void *arg) ctx = arg; if (if_managelink(ctx) == -1) { logger(ctx, LOG_ERR, "if_managelink: %m"); - eloop_event_delete(ctx->eloop, ctx->link_fd, 0); + eloop_event_delete(ctx->eloop, ctx->link_fd); close(ctx->link_fd); ctx->link_fd = -1; } @@ -1191,7 +1191,7 @@ dhcpcd_getinterfaces(void *arg) } if (write(fd->fd, &len, sizeof(len)) != sizeof(len)) return; - eloop_event_delete(fd->ctx->eloop, fd->fd, 1); + eloop_event_remove_writecb(fd->ctx->eloop, fd->fd); TAILQ_FOREACH(ifp, fd->ctx->ifaces, next) { if (send_interface(fd, ifp) == -1) logger(ifp->ctx, LOG_ERR, @@ -1821,7 +1821,7 @@ exit1: } free(ctx.duid); if (ctx.link_fd != -1) { - eloop_event_delete(ctx.eloop, ctx.link_fd, 0); + eloop_event_delete(ctx.eloop, ctx.link_fd); close(ctx.link_fd); } |
