Commit 037cd0d9 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 6d79722d

lib/vtls/curl_schannel.h

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

lib/vtls/gskit.c

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

}

lib/vtls/gskit.h

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

lib/vtls/nss.c

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

lib/vtls/nssg.h

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