shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-10 18:28:10 +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 21d918c68a
commit 4c679fd8a6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libssh/poll.h
View File

@@ -92,7 +92,7 @@ typedef struct ssh_poll_handle_struct *ssh_poll_handle;
* @return 0 on success, < 0 if you removed the poll object from * @return 0 on success, < 0 if you removed the poll object from
* it's poll context. * it's poll context.
*/ */
typedef int (*ssh_poll_callback)(ssh_poll_handle p, int fd, int revents, typedef int (*ssh_poll_callback)(ssh_poll_handle p, socket_t fd, int revents,
void *userdata); void *userdata);

10
libssh/poll.c
View File

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