Imported Upstream version 2.6.3

This commit is contained in:
Arnaud Quette 2012-01-24 11:22:33 +01:00
parent 45043b58d0
commit fad6ced6f6
255 changed files with 11081 additions and 4629 deletions

View file

@ -401,7 +401,6 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
char sport[NI_MAXSERV];
int v;
fd_set wfds;
int ret;
int error;
socklen_t error_size;
long fd_flags;
@ -483,7 +482,7 @@ int upscli_tryconnect(UPSCONN_t *ups, const char *host, int port, int flags,stru
if(errno == EINPROGRESS) {
FD_ZERO(&wfds);
FD_SET(sock_fd, &wfds);
ret = select(sock_fd+1,NULL,&wfds,NULL,
select(sock_fd+1,NULL,&wfds,NULL,
timeout);
if (FD_ISSET(sock_fd, &wfds)) {
error_size = sizeof(error);