From 037cd0d99159cd39b8e1217ad9a9362e7ab0b746 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 28 Dec 2014 17:21:02 +0000 Subject: vtls: Fixed compilation warning and an ignored return code curl_schannel.h:123: warning: right-hand operand of comma expression has no effect Some instances of the curlssl_close_all() function were declared with a void return type whilst others as int. The schannel version returned CURLE_NOT_BUILT_IN and others simply returned zero, but in all cases the return code was ignored by the calling function Curl_ssl_close_all(). For the time being and to keep the internal API consistent, changed all declarations to use a void return type. To reduce code we might want to consider removing the unimplemented versions and use a void #define like schannel does. --- lib/vtls/curl_schannel.h | 2 +- lib/vtls/gskit.c | 3 +-- lib/vtls/gskit.h | 2 +- lib/vtls/nss.c | 3 +-- lib/vtls/nssg.h | 2 +- lib/vtls/openssl.c | 3 +-- lib/vtls/openssl.h | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/vtls/curl_schannel.h b/lib/vtls/curl_schannel.h index d4a41440a..417dd732f 100644 --- a/lib/vtls/curl_schannel.h +++ b/lib/vtls/curl_schannel.h @@ -120,7 +120,7 @@ int Curl_schannel_random(unsigned char *entropy, size_t length); #define curlssl_connect Curl_schannel_connect #define curlssl_connect_nonblocking Curl_schannel_connect_nonblocking #define curlssl_session_free Curl_schannel_session_free -#define curlssl_close_all(x) (x=x, CURLE_NOT_BUILT_IN) +#define curlssl_close_all(x) ((void)x) #define curlssl_close Curl_schannel_close #define curlssl_shutdown Curl_schannel_shutdown #define curlssl_set_engine(x,y) (x=x, y=y, CURLE_NOT_BUILT_IN) diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index 0d133107b..ac05f05bb 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -986,11 +986,10 @@ void Curl_gskit_close(struct connectdata *conn, int sockindex) } -int Curl_gskit_close_all(struct SessionHandle *data) +void Curl_gskit_close_all(struct SessionHandle *data) { /* Unimplemented. */ (void) data; - return 0; } diff --git a/lib/vtls/gskit.h b/lib/vtls/gskit.h index fc1c45ccb..baec82323 100644 --- a/lib/vtls/gskit.h +++ b/lib/vtls/gskit.h @@ -36,7 +36,7 @@ CURLcode Curl_gskit_connect(struct connectdata * conn, int sockindex); CURLcode Curl_gskit_connect_nonblocking(struct connectdata * conn, int sockindex, bool * done); void Curl_gskit_close(struct connectdata *conn, int sockindex); -int Curl_gskit_close_all(struct SessionHandle * data); +void Curl_gskit_close_all(struct SessionHandle * data); int Curl_gskit_shutdown(struct connectdata * conn, int sockindex); size_t Curl_gskit_version(char * buffer, size_t size); diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c index d05b36d5f..dd83a9d68 100644 --- a/lib/vtls/nss.c +++ b/lib/vtls/nss.c @@ -1228,10 +1228,9 @@ void Curl_nss_close(struct connectdata *conn, int sockindex) * This function is called when the 'data' struct is going away. Close * down everything and free all resources! */ -int Curl_nss_close_all(struct SessionHandle *data) +void Curl_nss_close_all(struct SessionHandle *data) { (void)data; - return 0; } /* return true if NSS can provide error code (and possibly msg) for the diff --git a/lib/vtls/nssg.h b/lib/vtls/nssg.h index f6062f317..40b937524 100644 --- a/lib/vtls/nssg.h +++ b/lib/vtls/nssg.h @@ -39,7 +39,7 @@ void Curl_nss_close(struct connectdata *conn, int sockindex); /* tell NSS to close down all open information regarding connections (and thus session ID caching etc) */ -int Curl_nss_close_all(struct SessionHandle *data); +void Curl_nss_close_all(struct SessionHandle *data); int Curl_nss_init(void); void Curl_nss_cleanup(void); diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index a41447a5b..a68d88eae 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1038,7 +1038,7 @@ void Curl_ossl_session_free(void *ptr) * This function is called when the 'data' struct is going away. Close * down everything and free all resources! */ -int Curl_ossl_close_all(struct SessionHandle *data) +void Curl_ossl_close_all(struct SessionHandle *data) { #ifdef HAVE_OPENSSL_ENGINE_H if(data->state.engine) { @@ -1049,7 +1049,6 @@ int Curl_ossl_close_all(struct SessionHandle *data) #else (void)data; #endif - return 0; } static int asn1_output(const ASN1_UTCTIME *tm, diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h index 7eff3deea..9f5f3a28f 100644 --- a/lib/vtls/openssl.h +++ b/lib/vtls/openssl.h @@ -41,7 +41,7 @@ void Curl_ossl_close(struct connectdata *conn, int sockindex); /* tell OpenSSL to close down all open information regarding connections (and thus session ID caching etc) */ -int Curl_ossl_close_all(struct SessionHandle *data); +void Curl_ossl_close_all(struct SessionHandle *data); /* Sets an OpenSSL engine */ CURLcode Curl_ossl_set_engine(struct SessionHandle *data, const char *engine); -- cgit v1.2.3