diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2007-08-30 20:34:57 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2007-08-30 20:34:57 +0000 |
| commit | 9f44a95522162c0f4a61093efe1bf1f58b087358 (patch) | |
| tree | ea90ca762a9a7a4f6772cb44b23e994b41f32644 /lib/connect.c | |
| parent | 4b60c3e9d3d284125857ecf90b1910db5ba318a2 (diff) | |
Renamed several libcurl error codes and options to make them more general
and allow reuse by multiple protocols. Several unused error codes were
removed. In all cases, macros were added to preserve source (and binary)
compatibility with the old names. These macros are subject to removal at
a future date, but probably not before 2009. An application can be
tested to see if it is using any obsolete code by compiling it with the
CURL_NO_OLDIES macro defined.
Documented some newer error codes in libcurl-error(3)
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/connect.c b/lib/connect.c index 9877ae8f4..cfdf5680a 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -552,7 +552,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, if(has_passed > allow ) { /* time-out, bail out, go home */ failf(data, "Connection time-out after %ld ms", has_passed); - return CURLE_OPERATION_TIMEOUTED; + return CURLE_OPERATION_TIMEDOUT; } if(conn->bits.tcpconnect) { /* we are connected already! */ @@ -827,7 +827,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ if(timeout_ms < 0) { /* a precaution, no need to continue if time already is up */ failf(data, "Connection time-out"); - return CURLE_OPERATION_TIMEOUTED; + return CURLE_OPERATION_TIMEDOUT; } } Curl_expire(data, timeout_ms); @@ -863,7 +863,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ timeout_ms -= Curl_tvdiff(after, before); if(timeout_ms < 0) { failf(data, "connect() timed out!"); - return CURLE_OPERATION_TIMEOUTED; + return CURLE_OPERATION_TIMEDOUT; } before = after; } /* end of connect-to-each-address loop */ |