aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2006-10-29 21:19:23 +0000
committerYang Tse <yangsita@gmail.com>2006-10-29 21:19:23 +0000
commit609044aea2ffa2520b14b810e46e2a256c8db56c (patch)
treea1a713505029aca8e2a8d22223479642158c8278
parentba481718a461731ac92f1d0602d29d056251115c (diff)
Compiler warning fix
-rw-r--r--docs/examples/curlx.c9
-rw-r--r--tests/libtest/lib509.c9
2 files changed, 16 insertions, 2 deletions
diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c
index 1ee384ff2..31f01e8ad 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -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);
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index a21fae4a4..a911e3654 100644
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -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. */