X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=logger.c;fp=logger.c;h=8cdc7d20b244b3bd69f466c04827f06907019f55;hp=cd2970002c5cf61e4e38e78b005a06444250ef0f;hb=f94ea366d38fed424200b748cb042ca44f8c8d50;hpb=ef734fd6c2ec4e5602bbfe2a0d26dcf39c14d2bf diff --git a/logger.c b/logger.c index cd2970002..8cdc7d20b 100644 --- a/logger.c +++ b/logger.c @@ -319,7 +319,7 @@ static int stream_new(Server *s, int server_fd) { zero(ev); ev.data.ptr = stream; - ev.events = POLLIN; + ev.events = EPOLLIN; if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { r = -errno; goto fail; @@ -429,7 +429,7 @@ static int server_init(Server *s, unsigned n_sockets) { struct epoll_event ev; zero(ev); - ev.events = POLLIN; + ev.events = EPOLLIN; ev.data.ptr = UINT_TO_PTR(SERVER_FD_START+i); if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SERVER_FD_START+i, &ev) < 0) { r = -errno; @@ -479,7 +479,7 @@ static int process_event(Server *s, struct epoll_event *ev) { if (PTR_TO_UINT(ev->data.ptr) >= SERVER_FD_START && PTR_TO_UINT(ev->data.ptr) < SERVER_FD_START+s->n_server_fd) { - if (ev->events != POLLIN) { + if (ev->events != EPOLLIN) { log_info("Got invalid event from epoll. (1)"); return -EIO; } @@ -495,7 +495,7 @@ static int process_event(Server *s, struct epoll_event *ev) { timestamp = now(CLOCK_REALTIME); - if (!(ev->events & POLLIN)) { + if (!(ev->events & EPOLLIN)) { log_info("Got invalid event from epoll. (3)"); stream_free(stream); return 0;