summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-02-20 13:07:34 +0100
committerJeremy Allison <jra@samba.org>2013-03-01 12:00:29 -0800
commitb2114eb3b01a6259265391fbc41f0492bc26596e (patch)
treef793383197d61e565c2033a1c0891724236f51e9 /lib
parent5b9218a3c267cb51a389af14e88f5b4a0d3a77ea (diff)
downloadsamba-b2114eb3b01a6259265391fbc41f0492bc26596e.tar.gz
samba-b2114eb3b01a6259265391fbc41f0492bc26596e.tar.bz2
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')
-rw-r--r--lib/tevent/tevent_epoll.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index 6ad7b5b3e7..bdf57350fb 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);