moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

code cleanup: Use 'CURLcode result'

Browse Source
This commit is contained in:
Steve Holme 2014-10-30 23:14:45 +00:00
parent a9db36d1fd
commit befbc8f56b
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/connect.c
View File

@ -541,7 +541,7 @@ static CURLcode trynextip(struct connectdata *conn,
int sockindex, int sockindex,
int tempindex) int tempindex)
{ {
CURLcode rc = CURLE_COULDNT_CONNECT; CURLcode result = CURLE_COULDNT_CONNECT;
/* First clean up after the failed socket. /* First clean up after the failed socket.
Don't close it yet to ensure that the next IP's socket gets a different Don't close it yet to ensure that the next IP's socket gets a different
@ -575,11 +575,12 @@ static CURLcode trynextip(struct connectdata *conn,
ai = ai->ai_next; ai = ai->ai_next;
if(ai) { if(ai) {
rc = singleipconnect(conn, ai, &conn->tempsock[tempindex]); result = singleipconnect(conn, ai, &conn->tempsock[tempindex]);
if(rc == CURLE_COULDNT_CONNECT) { if(result == CURLE_COULDNT_CONNECT) {
ai = ai->ai_next; ai = ai->ai_next;
continue; continue;
} }
conn->tempaddr[tempindex] = ai; conn->tempaddr[tempindex] = ai;
} }
break; break;
@ -589,7 +590,7 @@ static CURLcode trynextip(struct connectdata *conn,
if(fd_to_close != CURL_SOCKET_BAD) if(fd_to_close != CURL_SOCKET_BAD)
Curl_closesocket(conn, fd_to_close); Curl_closesocket(conn, fd_to_close);
return rc; return result;
} }
/* Copies connection info into the session handle to make it available /* Copies connection info into the session handle to make it available

10
lib/hostasyn.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -75,7 +75,7 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
struct Curl_addrinfo *ai) struct Curl_addrinfo *ai)
{ {
struct Curl_dns_entry *dns = NULL; struct Curl_dns_entry *dns = NULL;
CURLcode rc = CURLE_OK; CURLcode result = CURLE_OK;
conn->async.status = status; conn->async.status = status;
@ -92,14 +92,14 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
if(!dns) { if(!dns) {
/* failed to store, cleanup and return error */ /* failed to store, cleanup and return error */
Curl_freeaddrinfo(ai); Curl_freeaddrinfo(ai);
rc = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
} }
if(data->share) if(data->share)
Curl_share_unlock(data, CURL_LOCK_DATA_DNS); Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
} }
else { else {
rc = CURLE_OUT_OF_MEMORY; result = CURLE_OUT_OF_MEMORY;
} }
} }
@ -112,7 +112,7 @@ CURLcode Curl_addrinfo_callback(struct connectdata *conn,
/* ipv4: The input hostent struct will be freed by ares when we return from /* ipv4: The input hostent struct will be freed by ares when we return from
this function */ this function */
return rc; return result;
} }
/* Call this function after Curl_connect() has returned async=TRUE and /* Call this function after Curl_connect() has returned async=TRUE and

27
lib/vtls/openssl.c
View File

@ -1913,8 +1913,7 @@ ossl_connect_step1(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
static CURLcode static CURLcode ossl_connect_step2(struct connectdata *conn, int sockindex)
ossl_connect_step2(struct connectdata *conn, int sockindex)
{ {
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
int err; int err;
@ -1946,7 +1945,7 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
unsigned long errdetail; unsigned long errdetail;
char error_buffer[256]; /* OpenSSL documents that this must be at least char error_buffer[256]; /* OpenSSL documents that this must be at least
256 bytes long. */ 256 bytes long. */
CURLcode rc; CURLcode result;
const char *cert_problem = NULL; const char *cert_problem = NULL;
long lerr; long lerr;
@ -1970,7 +1969,7 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
SSL routines: SSL routines:
SSL3_GET_SERVER_CERTIFICATE: SSL3_GET_SERVER_CERTIFICATE:
certificate verify failed */ certificate verify failed */
rc = CURLE_SSL_CACERT; result = CURLE_SSL_CACERT;
lerr = SSL_get_verify_result(connssl->handle); lerr = SSL_get_verify_result(connssl->handle);
if(lerr != X509_V_OK) { if(lerr != X509_V_OK) {
@ -1984,7 +1983,7 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
break; break;
default: default:
rc = CURLE_SSL_CONNECT_ERROR; result = CURLE_SSL_CONNECT_ERROR;
SSL_strerror(errdetail, error_buffer, sizeof(error_buffer)); SSL_strerror(errdetail, error_buffer, sizeof(error_buffer));
break; break;
} }
@ -1995,15 +1994,16 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
* (RST connection etc.), OpenSSL gives no explanation whatsoever and * (RST connection etc.), OpenSSL gives no explanation whatsoever and
* the SO_ERROR is also lost. * the SO_ERROR is also lost.
*/ */
if(CURLE_SSL_CONNECT_ERROR == rc && errdetail == 0) { if(CURLE_SSL_CONNECT_ERROR == result && errdetail == 0) {
failf(data, "Unknown SSL protocol error in connection to %s:%ld ", failf(data, "Unknown SSL protocol error in connection to %s:%ld ",
conn->host.name, conn->remote_port); conn->host.name, conn->remote_port);
return rc; return result;
} }
/* Could be a CERT problem */
/* Could be a CERT problem */
failf(data, "%s%s", cert_problem ? cert_problem : "", error_buffer); failf(data, "%s%s", cert_problem ? cert_problem : "", error_buffer);
return rc;
return result;
} }
} }
else { else {
@ -2011,9 +2011,9 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
connssl->connecting_state = ssl_connect_3; connssl->connecting_state = ssl_connect_3;
/* Informational message */ /* Informational message */
infof (data, "SSL connection using %s / %s\n", infof(data, "SSL connection using %s / %s\n",
get_ssl_version_txt(SSL_get_session(connssl->handle)), get_ssl_version_txt(SSL_get_session(connssl->handle)),
SSL_get_cipher(connssl->handle)); SSL_get_cipher(connssl->handle));
#ifdef HAS_ALPN #ifdef HAS_ALPN
/* Sets data and len to negotiated protocol, len is 0 if no protocol was /* Sets data and len to negotiated protocol, len is 0 if no protocol was
@ -2035,9 +2035,8 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
conn->negnpn = NPN_HTTP1_1; conn->negnpn = NPN_HTTP1_1;
} }
} }
else { else
infof(data, "ALPN, server did not agree to a protocol\n"); infof(data, "ALPN, server did not agree to a protocol\n");
}
} }
#endif #endif