Compiler warning fix

This commit is contained in:
Yang Tse 2006-10-29 21:19:23 +00:00
parent ba481718a4
commit 609044aea2
2 changed files with 16 additions and 2 deletions

View File

@ -114,6 +114,13 @@ static char *curlx_usage[]={
*/
/*
* We use this ZERO_NULL to avoid picky compiler warnings,
* when assigning a NULL pointer to a function pointer var.
*/
#define ZERO_NULL 0
/* This is a context that we pass to all callbacks */
typedef struct sslctxparm_st {
@ -236,7 +243,7 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {
SSL_CTX_set_verify_depth(ctx,2);
SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL);
SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,ZERO_NULL);
SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);

View File

@ -33,6 +33,13 @@
#define MAIN_LOOP_HANG_TIMEOUT 30 * 1000
#define MULTI_PERFORM_HANG_TIMEOUT 20 * 1000
/*
* We use this ZERO_NULL to avoid picky compiler warnings,
* when assigning a NULL pointer to a function pointer var.
*/
#define ZERO_NULL 0
int portnum; /* the HTTPS port number we use */
typedef struct sslctxparm_st {
@ -165,7 +172,7 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm)
but it still does, see the error handling in the call back */
SSL_CTX_set_verify_depth(ctx,0);
SSL_CTX_set_verify(ctx,SSL_VERIFY_NONE,NULL);
SSL_CTX_set_verify(ctx,SSL_VERIFY_NONE,ZERO_NULL);
#if OPENSSL_VERSION_NUMBER<0x00907000L
/* in newer openssl versions we can set a parameter for the call back. */