shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-05 21:00:33 +09:00
Code Issues Packages Projects Releases Wiki Activity

poll: Fixed type of the fd variables and use SSH_INVALID_SOCKET.

Browse Source
This commit is contained in:
Andreas Schneider
2010-06-17 13:25:45 +02:00
parent d484d4e129
commit 15e4e7e9da
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libssh/poll.c
View File

@@ -136,7 +136,7 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
/* compute fd_sets and find largest descriptor */
for (max_fd = 0, i = 0; i < nfds; i++) {
if (fds[i].fd == (socket_t) -1) {
if (fds[i].fd == SSH_INVALID_SOCKET) {
continue;
}
@@ -157,7 +157,7 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout) {
}
}
if (max_fd == (socket_t) -1) {
if (max_fd == SSH_INVALID_SOCKET) {
errno = EINVAL;
return -1;
}
@@ -443,7 +443,7 @@ void ssh_poll_ctx_free(ssh_poll_ctx ctx) {
used = ctx->polls_used;
for (i = 0; i < used; ) {
ssh_poll_handle p = ctx->pollptrs[i];
int fd = ctx->pollfds[i].fd;
socket_t fd = ctx->pollfds[i].fd;
/* force poll object removal */
if (p->cb(p, fd, POLLERR, p->cb_data) < 0) {
@@ -491,7 +491,7 @@ static int ssh_poll_ctx_resize(ssh_poll_ctx ctx, size_t new_size) {
* @return 0 on success, < 0 on error
*/
int ssh_poll_ctx_add(ssh_poll_ctx ctx, ssh_poll_handle p) {
int fd;
socket_t fd;
if (p->ctx != NULL) {
/* already attached to a context */