diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-02-20 13:07:34 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-03-01 12:00:29 -0800 |
| commit | b2114eb3b01a6259265391fbc41f0492bc26596e (patch) | |
| tree | f793383197d61e565c2033a1c0891724236f51e9 /lib/tevent/tevent_epoll.c | |
| parent | 5b9218a3c267cb51a389af14e88f5b4a0d3a77ea (diff) | |
| download | samba-b2114eb3b01a6259265391fbc41f0492bc26596e.tar.gz samba-b2114eb3b01a6259265391fbc41f0492bc26596e.tar.xz samba-b2114eb3b01a6259265391fbc41f0492bc26596e.zip | |
tevent: remove unused if (epoll_ev->epoll_fd == -1) return; checks
We'll never leave epoll_check_reopen() with epoll_fd == -1.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/tevent/tevent_epoll.c')
| -rw-r--r-- | lib/tevent/tevent_epoll.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c index 6ad7b5b3e7a..bdf57350fb0 100644 --- a/lib/tevent/tevent_epoll.c +++ b/lib/tevent/tevent_epoll.c @@ -268,8 +268,6 @@ static void epoll_add_event(struct epoll_event_context *epoll_ev, struct tevent_ { struct epoll_event event; - if (epoll_ev->epoll_fd == -1) return; - fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR; /* if we don't want events yet, don't add an epoll_event */ @@ -297,8 +295,6 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_ { struct epoll_event event; - if (epoll_ev->epoll_fd == -1) return; - fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR; /* if there's no epoll_event, we don't need to delete it */ @@ -321,7 +317,6 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_ static void epoll_mod_event(struct epoll_event_context *epoll_ev, struct tevent_fd *fde) { struct epoll_event event; - if (epoll_ev->epoll_fd == -1) return; fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR; @@ -345,8 +340,6 @@ static void epoll_change_event(struct epoll_event_context *epoll_ev, struct teve bool want_read = (fde->flags & TEVENT_FD_READ); bool want_write= (fde->flags & TEVENT_FD_WRITE); - if (epoll_ev->epoll_fd == -1) return; - fde->additional_flags &= ~EPOLL_ADDITIONAL_FD_FLAG_REPORT_ERROR; /* there's already an event */ @@ -383,8 +376,6 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval int timeout = -1; int wait_errno; - if (epoll_ev->epoll_fd == -1) return -1; - if (tvalp) { /* it's better to trigger timed events a bit later than too early */ timeout = ((tvalp->tv_usec+999) / 1000) + (tvalp->tv_sec*1000); |