Unverified Commit b31d1dcd authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Daniel Stenberg
Browse files

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: default avatarJohannes Schindelin <johannes.schindelin@gmx.de>
parent dd02a9a3

lib/vtls/axtls.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

lib/vtls/axtls.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

lib/vtls/gtls.c

+1 −2
Original line number Diff line number Diff line
@@ -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

lib/vtls/gtls.h

+1 −1
Original line number Diff line number Diff line
@@ -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,