From 5d9fcd2165fd1aa77c47b1d63cb33bfa3c21ec21 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 20 Jun 2017 11:32:53 +0200 Subject: [PATCH] axtls: use Curl_none_* versions of init() and cleanup() There are convenient no-op versions of the init/cleanup functions now, no need to define private ones for axTLS. Signed-off-by: Johannes Schindelin --- lib/vtls/axtls.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c index ca182e507..ceebc9a7a 100644 --- a/lib/vtls/axtls.c +++ b/lib/vtls/axtls.c @@ -47,21 +47,6 @@ #include "curl_memory.h" #include "memdebug.h" - -/* Global axTLS init, called from Curl_ssl_init() */ -static int Curl_axtls_init(void) -{ -/* axTLS has no global init. Everything is done through SSL and SSL_CTX - * structs stored in connectdata structure. Perhaps can move to axtls.h. - */ - return 1; -} - -static void Curl_axtls_cleanup(void) -{ - /* axTLS has no global cleanup. Perhaps can move this to axtls.h. */ -} - static CURLcode map_error_to_curl(int axtls_err) { switch(axtls_err) { @@ -705,8 +690,13 @@ const struct Curl_ssl Curl_ssl_axtls = { 0, /* have_ssl_ctx */ 0, /* support_https_proxy */ - Curl_axtls_init, /* init */ - Curl_axtls_cleanup, /* cleanup */ + /* + * axTLS has no global init. Everything is done through SSL and SSL_CTX + * structs stored in connectdata structure. + */ + Curl_none_init, /* init */ + /* axTLS has no global cleanup. */ + Curl_none_cleanup, /* cleanup */ Curl_axtls_version, /* version */ Curl_axtls_check_cxn, /* check_cxn */ Curl_axtls_shutdown, /* shutdown */