summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-06-25 13:06:54 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-08-28 14:56:55 +0200
commitb31d1dcddb6dc7a111d2d8a8806c55ab439e76a7 (patch)
treeee4efd6ac755ef88f10e9ff1af8ff317d9cec0ce
parentdd02a9a341659ed06839a474d685b99af3a082e2 (diff)
downloadcurl-b31d1dcddb6dc7a111d2d8a8806c55ab439e76a7.tar.gz
vtls: make sure all _cleanup() functions return void
This patch makes the signature of the _cleanup() functions consistent among the SSL backends, in preparation for unifying the way all SSL backends are accessed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--lib/vtls/axtls.c3
-rw-r--r--lib/vtls/axtls.h2
-rw-r--r--lib/vtls/gtls.c3
-rw-r--r--lib/vtls/gtls.h2
4 files changed, 4 insertions, 6 deletions
diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index f0e376640..e063232ea 100644
--- a/lib/vtls/axtls.c
+++ b/lib/vtls/axtls.c
@@ -57,10 +57,9 @@ int Curl_axtls_init(void)
return 1;
}
-int Curl_axtls_cleanup(void)
+void Curl_axtls_cleanup(void)
{
/* axTLS has no global cleanup. Perhaps can move this to axtls.h. */
- return 1;
}
static CURLcode map_error_to_curl(int axtls_err)
diff --git a/lib/vtls/axtls.h b/lib/vtls/axtls.h
index 53797eadb..e4c0c1307 100644
--- a/lib/vtls/axtls.h
+++ b/lib/vtls/axtls.h
@@ -28,7 +28,7 @@
#include "urldata.h"
int Curl_axtls_init(void);
-int Curl_axtls_cleanup(void);
+void Curl_axtls_cleanup(void);
CURLcode Curl_axtls_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_axtls_connect_nonblocking(
struct connectdata *conn,
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index d55f995e8..3889b8e5f 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -200,13 +200,12 @@ int Curl_gtls_init(void)
return ret;
}
-int Curl_gtls_cleanup(void)
+void Curl_gtls_cleanup(void)
{
if(gtls_inited) {
gnutls_global_deinit();
gtls_inited = FALSE;
}
- return 1;
}
#ifndef CURL_DISABLE_VERBOSE_STRINGS
diff --git a/lib/vtls/gtls.h b/lib/vtls/gtls.h
index 462c04853..3e5d9e000 100644
--- a/lib/vtls/gtls.h
+++ b/lib/vtls/gtls.h
@@ -29,7 +29,7 @@
#include "urldata.h"
int Curl_gtls_init(void);
-int Curl_gtls_cleanup(void);
+void Curl_gtls_cleanup(void);
CURLcode Curl_gtls_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_gtls_connect_nonblocking(struct connectdata *conn,
int sockindex,