generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Curl_timeleft: s/conn/data in first argument

Browse Source 
As the function doesn't really use the connectdata struct but only the
SessionHanadle struct I modified what argument it wants.
This commit is contained in:
Daniel Stenberg
2011-01-04 23:07:58 +01:00
parent a2c8966d50
commit adb49ad8bb
17 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/transfer.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1064,7 +1064,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
return result;
if(k->keepon) {
if(0 > Curl_timeleft(conn, &k->now, FALSE)) {
if(0 > Curl_timeleft(data, &k->now, FALSE)) {
if(k->size != -1) {
failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",
@@ -1347,7 +1347,7 @@ Transfer(struct connectdata *conn)
to work with, skip the timeout */
timeout_ms = 0;
else {
totmp = Curl_timeleft(conn, &k->now, FALSE);
totmp = Curl_timeleft(data, &k->now, FALSE);
if(totmp < 0)
return CURLE_OPERATION_TIMEDOUT;
else if(!totmp)