From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 25 Jun 2017 11:06:54 +0000 (+0200)
Subject: vtls: make sure all _cleanup() functions return void
X-Git-Tag: curl-7_56_0~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b31d1dcddb6dc7a111d2d8a8806c55ab439e76a7;p=thirdparty%2Fcurl.git

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>
---

diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index f0e376640c..e063232ea6 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 53797eadbb..e4c0c13073 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 d55f995e84..3889b8e5f0 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 462c04853e..3e5d9e0002 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,