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

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.

diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index 6b42708d83113469692892577e7554a8a80aaaef..9294f49edc49e10ef64ab8025e9013ec198a0fc3 100644 (file)
--- a/lib/vtls/axtls.c
+++ b/lib/vtls/axtls.c
@@ -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 */

diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c
index ba5ee1548675c0805b9e1287c720f367d7adcd6a..e06522304b84d05b8f930aaed340202f9cd1a861 100644 (file)
--- a/lib/vtls/cyassl.c
+++ b/lib/vtls/cyassl.c
@@ -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 */

diff --git a/lib/vtls/darwinssl.c b/lib/vtls/darwinssl.c
index 063f93c0342a3e83aa37c6bdbd5d820b322b1b23..31690422407ef632acee52bd6f9d769d16b5e668 100644 (file)
--- a/lib/vtls/darwinssl.c
+++ b/lib/vtls/darwinssl.c
@@ -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 */

diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c
index ba5faeff8e43e6f30b91960228111254d91582b7..de496dd125fde571a82e17723156b60f0ccbc9ed 100644 (file)
--- a/lib/vtls/gskit.c
+++ b/lib/vtls/gskit.c
@@ -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 */

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index a844915ef08540dd8c70b2e52cb40fcd1f9c683f..30b255b81adef0e8bd054b53bb2fe3542c779c86 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -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 */

diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c
index ce1f8eba80c6a94d4df69d82aff864a263ce89ad..28251a38886327af604bda305e0d02df1af02d1e 100644 (file)
--- a/lib/vtls/mbedtls.c
+++ b/lib/vtls/mbedtls.c
@@ -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 */

diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index c0b7e63abc9386947426c1decdd7c96b5840f6ab..a3ef37a12cb7c4145132f5cde127f31651fde3b2 100644 (file)
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -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 */

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index b9a061f31350f797b01a2aead07e80388c05ff82..f94415222041e004d0f4b93873b7b5cae9ebbebe 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -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 */

diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c
index fc0644f8969a52d6b3982154c6daf948db0e16c6..df29fa945ea611054401ec5238c8a771af7253f1 100644 (file)
--- a/lib/vtls/polarssl.c
+++ b/lib/vtls/polarssl.c
@@ -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 */

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 9ca1431bdb2da1016398f4e79de7144a018b28ed..85c64cf4468d6ded78c3309f3959106571a3294b 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -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 */

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index e1cae1b404af9b71c7b7322868511a7860c2be48..56e6317713e5a93aa00530ec215de90ab83e9ab4 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -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 */

diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index f1a11ea58d73d51395d93d47239b2f22da07ee76..c5f9d4a3facdd162cc7c563dff1373218538dd85 100644 (file)
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -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);