diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-09 13:16:55 +1100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-02-16 15:49:21 -0800 |
| commit | 367c567c5f35db202474c8d3f730484538e1fb97 (patch) | |
| tree | 6d4a05b6e2f2923fec8564d360eb7085a831d128 /source3/lib/util_sock.c | |
| parent | ab80995580f092811d6380caa9e71e4c5fda06f4 (diff) | |
| download | samba-367c567c5f35db202474c8d3f730484538e1fb97.tar.gz samba-367c567c5f35db202474c8d3f730484538e1fb97.tar.bz2 samba-367c567c5f35db202474c8d3f730484538e1fb97.zip | |
lib/util: Remove sys_poll as it is no longer needed
sys_poll() is only needed if the signal pipe is set up and used, but as
no signal handler ever writes to the pipe, this can all be removed.
signal based events are now handled via tevent.
Andrew Bartlett
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/lib/util_sock.c')
| -rw-r--r-- | source3/lib/util_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index dcc41bb699..69e33f7725 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -1604,7 +1604,7 @@ int poll_one_fd(int fd, int events, int timeout, int *revents) int ret; int saved_errno; - fds = talloc_zero_array(talloc_tos(), struct pollfd, 2); + fds = talloc_zero_array(talloc_tos(), struct pollfd, 1); if (fds == NULL) { errno = ENOMEM; return -1; @@ -1612,7 +1612,7 @@ int poll_one_fd(int fd, int events, int timeout, int *revents) fds[0].fd = fd; fds[0].events = events; - ret = sys_poll(fds, 1, timeout); + ret = poll(fds, 1, timeout); /* * Assign whatever poll did, even in the ret<=0 case. |