Commit 8aee8a6a authored Oct 19, 2017 by Patrick Monnerat

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.

parent a4fc19eb

lib/vtls/axtls.c

+1 −1

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

lib/vtls/cyassl.c

+1 −1

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

lib/vtls/darwinssl.c

+1 −1

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

lib/vtls/gskit.c

+1 −1

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

lib/vtls/gtls.c

+1 −1

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