projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
817d173
)
our timeout values are longs while 'tv_sec' is int
author
Daniel Stenberg
<daniel@haxx.se>
Wed, 3 Mar 2004 13:17:44 +0000
(13:17 +0000)
committer
Daniel Stenberg
<daniel@haxx.se>
Wed, 3 Mar 2004 13:17:44 +0000
(13:17 +0000)
lib/ftp.c
patch
|
blob
|
history
diff --git
a/lib/ftp.c
b/lib/ftp.c
index
c0a18ca
..
edd6314
100644
(file)
--- a/
lib/ftp.c
+++ b/
lib/ftp.c
@@
-151,7
+151,7
@@
static CURLcode AllowServerConnect(struct connectdata *conn)
}
/* we give the server 60 seconds to connect to us, or a custom timeout */
- dt.tv_sec =
timeout?timeout:60
;
+ dt.tv_sec =
(int)(timeout?timeout:60)
;
dt.tv_usec = 0;
switch (select(sock+1, &rdset, NULL, NULL, &dt)) {
@@
-216,7
+216,7
@@
CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
bool keepon=TRUE;
ssize_t gotbytes;
char *ptr;
-
int
timeout; /* timeout in seconds */
+
long
timeout; /* timeout in seconds */
struct timeval interval;
fd_set rkeepfd;
fd_set readfd;