Skip to content
Permalink
Browse files

Rename some parts of the SSL function structure as GCC was confusing …

…them with macros
  • Loading branch information...
chris-y committed Mar 12, 2019
1 parent a203e4c commit ba106b1a34ddc5bdb62f7a39e1c43ffaebdc730c
Showing with 5 additions and 5 deletions.
  1. +3 −3 lib/vtls/vtls.c
  2. +2 −2 lib/vtls/vtls.h
@@ -248,7 +248,7 @@ Curl_ssl_connect(struct connectdata *conn, int sockindex)
conn->ssl[sockindex].use = TRUE;
conn->ssl[sockindex].state = ssl_connection_negotiating;

result = Curl_ssl->connect(conn, sockindex);
result = Curl_ssl->connect_blocking(conn, sockindex);

if(!result)
Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */
@@ -557,7 +557,7 @@ void Curl_ssl_close(struct connectdata *conn, int sockindex)

CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)
{
if(Curl_ssl->shutdown(conn, sockindex))
if(Curl_ssl->shut_down(conn, sockindex))
return CURLE_SSL_SHUTDOWN_FAILED;

conn->ssl[sockindex].use = FALSE; /* get back to ordinary socket usage */
@@ -1114,7 +1114,7 @@ static CURLcode Curl_multissl_connect(struct connectdata *conn, int sockindex)
{
if(multissl_init(NULL))
return CURLE_FAILED_INIT;
return Curl_ssl->connect(conn, sockindex);
return Curl_ssl->connect_blocking(conn, sockindex);
}

static CURLcode Curl_multissl_connect_nonblocking(struct connectdata *conn,
@@ -47,7 +47,7 @@ struct Curl_ssl {

size_t (*version)(char *buffer, size_t size);
int (*check_cxn)(struct connectdata *cxn);
int (*shutdown)(struct connectdata *conn, int sockindex);
int (*shut_down)(struct connectdata *conn, int sockindex);
bool (*data_pending)(const struct connectdata *conn,
int connindex);

@@ -56,7 +56,7 @@ struct Curl_ssl {
size_t length);
bool (*cert_status_request)(void);

CURLcode (*connect)(struct connectdata *conn, int sockindex);
CURLcode (*connect_blocking)(struct connectdata *conn, int sockindex);
CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex,
bool *done);
void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info);

0 comments on commit ba106b1

Please sign in to comment.
You can’t perform that action at this time.