diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-02 22:37:19 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-02 22:37:19 +0000 |
| commit | 8ffa021de86b08b28be33b769f129c3c951ad1a7 (patch) | |
| tree | b0bf7c78c744118a8cdb785a992cc22ca9148da3 /fdm.c | |
| parent | fdm: fdm_destroy(): assert deferred delete list is empty (diff) | |
fdm: rename struct fd -> struct handler
Diffstat (limited to 'fdm.c')
| -rw-r--r-- | fdm.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -12,18 +12,18 @@ #include "log.h" #include "tllist.h" -struct fd { +struct handler { int fd; - void *data; - fdm_handler_t handler; + fdm_handler_t callback; + void *callback_data; bool deleted; }; struct fdm { int epoll_fd; bool is_polling; - tll(struct fd *) fds; - tll(struct fd *) deferred_delete; + tll(struct handler *) fds; + tll(struct handler *) deferred_delete; }; struct fdm * @@ -75,11 +75,11 @@ fdm_add(struct fdm *fdm, int fd, int events, fdm_handler_t handler, void *data) } #endif - struct fd *fd_data = malloc(sizeof(*fd_data)); - *fd_data = (struct fd) { + struct handler *fd_data = malloc(sizeof(*fd_data)); + *fd_data = (struct handler) { .fd = fd, - .data = data, - .handler = handler, + .callback = handler, + .callback_data = data, .deleted = false, }; @@ -165,11 +165,11 @@ fdm_poll(struct fdm *fdm) fdm->is_polling = true; for (int i = 0; i < ret; i++) { - struct fd *fd = events[i].data.ptr; + struct handler *fd = events[i].data.ptr; if (fd->deleted) continue; - if (!fd->handler(fdm, fd->fd, events[i].events, fd->data)) { + if (!fd->callback(fdm, fd->fd, events[i].events, fd->callback_data)) { ret = false; break; } |
