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

vtls: change struct Curl_ssl close' field name to close_one'.

Browse Source 
On OS/400, `close' is an ASCII system macro that corrupts the code if
not used in a context not targetting the close() system API.
This commit is contained in:
Patrick Monnerat 2017-10-19 19:55:17 +01:00
parent a4fc19eb4d
commit 8aee8a6a2d
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vtls/axtls.c
View File

@ -728,7 +728,7 @@ const struct Curl_ssl Curl_ssl_axtls = {
Curl_axtls_connect, /* connect */
Curl_axtls_connect_nonblocking, /* connect_nonblocking */
Curl_axtls_get_internals, /* get_internals */
Curl_axtls_close, /* close */
Curl_axtls_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_axtls_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/cyassl.c
View File

@ -1003,7 +1003,7 @@ const struct Curl_ssl Curl_ssl_cyassl = {
Curl_cyassl_connect, /* connect */
Curl_cyassl_connect_nonblocking, /* connect_nonblocking */
Curl_cyassl_get_internals, /* get_internals */
Curl_cyassl_close, /* close */
Curl_cyassl_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_cyassl_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/darwinssl.c
View File

@ -3002,7 +3002,7 @@ const struct Curl_ssl Curl_ssl_darwinssl = {
Curl_darwinssl_connect, /* connect */
Curl_darwinssl_connect_nonblocking, /* connect_nonblocking */
Curl_darwinssl_get_internals, /* get_internals */
Curl_darwinssl_close, /* close */
Curl_darwinssl_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_darwinssl_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/gskit.c
View File

@ -1375,7 +1375,7 @@ const struct Curl_ssl Curl_ssl_gskit = {
Curl_gskit_connect, /* connect */
Curl_gskit_connect_nonblocking, /* connect_nonblocking */
Curl_gskit_get_internals, /* get_internals */
Curl_gskit_close, /* close */
Curl_gskit_close, /* close_one */
Curl_none_close_all, /* close_all */
/* No session handling for GSKit */
Curl_none_session_free, /* session_free */

2
lib/vtls/gtls.c
View File

@ -1827,7 +1827,7 @@ const struct Curl_ssl Curl_ssl_gnutls = {
Curl_gtls_connect, /* connect */
Curl_gtls_connect_nonblocking, /* connect_nonblocking */
Curl_gtls_get_internals, /* get_internals */
Curl_gtls_close, /* close */
Curl_gtls_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_gtls_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/mbedtls.c
View File

@ -1061,7 +1061,7 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
Curl_mbedtls_connect, /* connect */
Curl_mbedtls_connect_nonblocking, /* connect_nonblocking */
Curl_mbedtls_get_internals, /* get_internals */
Curl_mbedtls_close, /* close */
Curl_mbedtls_close, /* close_one */
Curl_mbedtls_close_all, /* close_all */
Curl_mbedtls_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/nss.c
View File

@ -2365,7 +2365,7 @@ const struct Curl_ssl Curl_ssl_nss = {
Curl_nss_connect, /* connect */
Curl_nss_connect_nonblocking, /* connect_nonblocking */
Curl_nss_get_internals, /* get_internals */
Curl_nss_close, /* close */
Curl_nss_close, /* close_one */
Curl_none_close_all, /* close_all */
/* NSS has its own session ID cache */
Curl_none_session_free, /* session_free */

2
lib/vtls/openssl.c
View File

@ -3637,7 +3637,7 @@ const struct Curl_ssl Curl_ssl_openssl = {
Curl_ossl_connect, /* connect */
Curl_ossl_connect_nonblocking, /* connect_nonblocking */
Curl_ossl_get_internals, /* get_internals */
Curl_ossl_close, /* close */
Curl_ossl_close, /* close_one */
Curl_ossl_close_all, /* close_all */
Curl_ossl_session_free, /* session_free */
Curl_ossl_set_engine, /* set_engine */

2
lib/vtls/polarssl.c
View File

@ -923,7 +923,7 @@ const struct Curl_ssl Curl_ssl_polarssl = {
Curl_polarssl_connect, /* connect */
Curl_polarssl_connect_nonblocking, /* connect_nonblocking */
Curl_polarssl_get_internals, /* get_internals */
Curl_polarssl_close, /* close */
Curl_polarssl_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_polarssl_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/schannel.c
View File

@ -1838,7 +1838,7 @@ const struct Curl_ssl Curl_ssl_schannel = {
Curl_schannel_connect, /* connect */
Curl_schannel_connect_nonblocking, /* connect_nonblocking */
Curl_schannel_get_internals, /* get_internals */
Curl_schannel_close, /* close */
Curl_schannel_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_schannel_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

6
lib/vtls/vtls.c
View File

@ -549,7 +549,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
void Curl_ssl_close(struct connectdata *conn, int sockindex)
{
DEBUGASSERT((sockindex <= 1) && (sockindex >= -1));
Curl_ssl->close(conn, sockindex);
Curl_ssl->close_one(conn, sockindex);
}
CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)
@ -1122,7 +1122,7 @@ static void Curl_multissl_close(struct connectdata *conn, int sockindex)
{
if(multissl_init(NULL))
return;
Curl_ssl->close(conn, sockindex);
Curl_ssl->close_one(conn, sockindex);
}
static const struct Curl_ssl Curl_ssl_multi = {
@ -1147,7 +1147,7 @@ static const struct Curl_ssl Curl_ssl_multi = {
Curl_multissl_connect, /* connect */
Curl_multissl_connect_nonblocking, /* connect_nonblocking */
Curl_multissl_get_internals, /* get_internals */
Curl_multissl_close, /* close */
Curl_multissl_close, /* close_one */
Curl_none_close_all, /* close_all */
Curl_none_session_free, /* session_free */
Curl_none_set_engine, /* set_engine */

2
lib/vtls/vtls.h
View File

@ -60,7 +60,7 @@ struct Curl_ssl {
CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex,
bool *done);
void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info);
void (*close)(struct connectdata *conn, int sockindex);
void (*close_one)(struct connectdata *conn, int sockindex);
void (*close_all)(struct Curl_easy *data);
void (*session_free)(void *ptr);