From 603d6e443cb2d9f8b83d75483985c59b2044d74e Mon Sep 17 00:00:00 2001 From: Steve Bennett Date: Sat, 17 Sep 2011 10:18:02 +1000 Subject: Cleanup in jim-eventloop "eof" event no longer exists Signed-off-by: Steve Bennett --- jim-eventloop.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'jim-eventloop.c') diff --git a/jim-eventloop.c b/jim-eventloop.c index f2a5fd0..a7efdc2 100644 --- a/jim-eventloop.c +++ b/jim-eventloop.c @@ -436,21 +436,16 @@ int Jim_ProcessEvents(Jim_Interp *interp, int flags) fe = eventLoop->fileEventHead; while (fe != NULL) { int fd = fileno(fe->handle); + int mask = 0; - if ((fe->mask & JIM_EVENT_READABLE && FD_ISSET(fd, &rfds)) || - (fe->mask & JIM_EVENT_WRITABLE && FD_ISSET(fd, &wfds)) || - (fe->mask & JIM_EVENT_EXCEPTION && FD_ISSET(fd, &efds))) { - int mask = 0; + if ((fe->mask & JIM_EVENT_READABLE) && FD_ISSET(fd, &rfds)) + mask |= JIM_EVENT_READABLE; + if (fe->mask & JIM_EVENT_WRITABLE && FD_ISSET(fd, &wfds)) + mask |= JIM_EVENT_WRITABLE; + if (fe->mask & JIM_EVENT_EXCEPTION && FD_ISSET(fd, &efds)) + mask |= JIM_EVENT_EXCEPTION; - if ((fe->mask & JIM_EVENT_READABLE) && FD_ISSET(fd, &rfds)) { - mask |= JIM_EVENT_READABLE; - if ((fe->mask & JIM_EVENT_FEOF) && feof(fe->handle)) - mask |= JIM_EVENT_FEOF; - } - if (fe->mask & JIM_EVENT_WRITABLE && FD_ISSET(fd, &wfds)) - mask |= JIM_EVENT_WRITABLE; - if (fe->mask & JIM_EVENT_EXCEPTION && FD_ISSET(fd, &efds)) - mask |= JIM_EVENT_EXCEPTION; + if (mask) { if (fe->fileProc(interp, fe->clientData, mask) != JIM_OK) { /* Remove the element on handler error */ Jim_DeleteFileHandler(interp, fe->handle); -- cgit v1.1