cURL / Mailing Lists / curl-library / Single Mail

curl-library

Re: SSL_CTX_callback_ctrl callback changed

From: Yang Tse <yangsita_at_gmail.com>
Date: Sun, 13 Nov 2005 22:52:08 +0100

Maybe you could take in consideration the following patches:

This first patch addresses the SSL_CTX_callback_ctrl compiler warning:

diff -urp c:\f\curl-old/curl/lib/ssluse.c c:\f\curl-new/curl/lib/ssluse.c
--- c:\f\curl-old/curl/lib/ssluse.c 2005-08-11 00:57:14.000000000 +0200
+++ c:\f\curl-new/curl/lib/ssluse.c 2005-11-13 22:20:01.125285500 +0100
@@ -1162,7 +1162,7 @@ Curl_ossl_connect(struct connectdata *co
 #ifdef SSL_CTRL_SET_MSG_CALLBACK
   if (data->set.fdebug) {
     if (!SSL_CTX_callback_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK,
- ssl_tls_trace)) {
+ (void (*)(void))ssl_tls_trace)) {
       failf(data, "SSL: couldn't set callback!");
       return CURLE_SSL_CONNECT_ERROR;
     }

And this second patch addresses three 'macro redefinition compiler warnings:

diff -urp c:\f\curl-old/curl/lib/memdebug.h c:\f\curl-new/curl/lib/memdebug.h
--- c:\f\curl-old/curl/lib/memdebug.h 2005-06-30 15:28:58.000000000 +0200
+++ c:\f\curl-new/curl/lib/memdebug.h 2005-11-13 22:38:08.437785500 +0100
@@ -92,12 +92,15 @@ CURL_EXTERN int curl_fclose(FILE *file,
 #define ogetaddrinfo(host,serv,hint,res) \
   curl_dogetaddrinfo(host,serv,hint,res,__LINE__,__FILE__)
 #else
+#undef getaddrinfo
 #define getaddrinfo(host,serv,hint,res) \
   curl_dogetaddrinfo(host,serv,hint,res,__LINE__,__FILE__)
 #endif
+#undef getnameinfo
 #define getnameinfo(sa,salen,host,hostlen,serv,servlen,flags) \
   curl_dogetnameinfo(sa,salen,host,hostlen,serv,servlen,flags, __LINE__, \
   __FILE__)
+#undef freeaddrinfo
 #define freeaddrinfo(data) \
   curl_dofreeaddrinfo(data,__LINE__,__FILE__)
Received on 2005-11-13