aboutsummaryrefslogtreecommitdiff
path: root/src/connect.c
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-07-22 12:27:07 +0200
committerAndreas Schneider <asn@cryptomilk.org>2013-07-22 13:01:36 +0200
commit35d0c3a86008db3131a404e60e24153ffb91c149 (patch)
tree1f44f8a0b8e931783ed203fafb72c1ca54c89faa /src/connect.c
parent229ef082c1b21fc9063010d907982be981d1970d (diff)
downloadlibssh-35d0c3a86008db3131a404e60e24153ffb91c149.tar.gz
libssh-35d0c3a86008db3131a404e60e24153ffb91c149.tar.xz
libssh-35d0c3a86008db3131a404e60e24153ffb91c149.zip
connect: Fix a build warning on Windows.
Diffstat (limited to 'src/connect.c')
-rw-r--r--src/connect.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/connect.c b/src/connect.c
index c4ae7b93..f7965cbe 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -436,6 +436,7 @@ static int ssh_select_cb (socket_t fd, int revents, void *userdata){
*/
int ssh_select(ssh_channel *channels, ssh_channel *outchannels, socket_t maxfd,
fd_set *readfds, struct timeval *timeout) {
+ socket_t fd;
int i,j;
int rc;
int base_tm, tm;
@@ -447,10 +448,11 @@ int ssh_select(ssh_channel *channels, ssh_channel *outchannels, socket_t maxfd,
for (i=0 ; channels[i] != NULL; ++i){
ssh_event_add_session(event, channels[i]->session);
}
- for (i=0; i<maxfd ; ++i){
- if(FD_ISSET(i, readfds)){
- ssh_event_add_fd(event, i, POLLIN, ssh_select_cb, readfds);
- }
+
+ for (fd = 0; fd < maxfd ; fd++) {
+ if (FD_ISSET(fd, readfds)) {
+ ssh_event_add_fd(event, fd, POLLIN, ssh_select_cb, readfds);
+ }
}
outchannels[0] = NULL;
FD_ZERO(readfds);
@@ -471,9 +473,12 @@ int ssh_select(ssh_channel *channels, ssh_channel *outchannels, socket_t maxfd,
if(j != 0)
break;
/* watch if a user socket was triggered */
- for(i = 0;i<maxfd;++i)
- if(FD_ISSET(i, readfds))
- goto out;
+ for (fd = 0; fd < maxfd; fd++) {
+ if (FD_ISSET(fd, readfds)) {
+ goto out;
+ }
+ }
+
/* If the timeout is elapsed, we should go out */
if(!firstround && ssh_timeout_elapsed(&ts, base_tm))
goto out;