git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e21d8f3
)
Revert "select e_fds"
author
Stefan Metzmacher
<metze@samba.org>
Fri, 1 Mar 2013 05:00:26 +0000
(06:00 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Tue, 4 Oct 2016 12:52:14 +0000
(14:52 +0200)
This reverts commit
dc8ee2e06a3119ec909aa56e6d5717b8827712b1
.
lib/tevent/tevent_select.c
patch
|
blob
|
history
diff --git
a/lib/tevent/tevent_select.c
b/lib/tevent/tevent_select.c
index 9dfe703793233de4d5bdcabc80bfae782176800c..55dd0b66f66c52eb8fea3e3ed78e973ca643c6bb 100644
(file)
--- a/
lib/tevent/tevent_select.c
+++ b/
lib/tevent/tevent_select.c
@@
-139,7
+139,7
@@
static struct tevent_fd *select_event_add_fd(struct tevent_context *ev, TALLOC_C
*/
static int select_event_loop_select(struct select_event_context *select_ev, struct timeval *tvalp)
{
*/
static int select_event_loop_select(struct select_event_context *select_ev, struct timeval *tvalp)
{
- fd_set r_fds, w_fds
, e_fds
;
+ fd_set r_fds, w_fds;
struct tevent_fd *fde;
int selrtn;
int select_errno;
struct tevent_fd *fde;
int selrtn;
int select_errno;
@@
-151,7
+151,6
@@
static int select_event_loop_select(struct select_event_context *select_ev, stru
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
FD_ZERO(&r_fds);
FD_ZERO(&w_fds);
- FD_ZERO(&e_fds);
/* setup any fd events */
for (fde = select_ev->ev->fd_events; fde; fde = fde->next) {
/* setup any fd events */
for (fde = select_ev->ev->fd_events; fde; fde = fde->next) {
@@
-166,7
+165,6
@@
static int select_event_loop_select(struct select_event_context *select_ev, stru
if (fde->flags & TEVENT_FD_READ) {
FD_SET(fde->fd, &r_fds);
if (fde->flags & TEVENT_FD_READ) {
FD_SET(fde->fd, &r_fds);
- FD_SET(fde->fd, &e_fds);
}
if (fde->flags & TEVENT_FD_WRITE) {
FD_SET(fde->fd, &w_fds);
}
if (fde->flags & TEVENT_FD_WRITE) {
FD_SET(fde->fd, &w_fds);
@@
-179,7
+177,7
@@
static int select_event_loop_select(struct select_event_context *select_ev, stru
}
tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_BEFORE_WAIT);
}
tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_BEFORE_WAIT);
- selrtn = select(select_ev->maxfd+1, &r_fds, &w_fds,
&e_fds
, tvalp);
+ selrtn = select(select_ev->maxfd+1, &r_fds, &w_fds,
NULL
, tvalp);
select_errno = errno;
tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_AFTER_WAIT);
select_errno = errno;
tevent_trace_point_callback(select_ev->ev, TEVENT_TRACE_AFTER_WAIT);