svn commit: r1681101 - in /tomcat/native/trunk/native/src: sslcontext.c sslnetwork.c

[rjung]

Author: rjung
Date: Fri May 22 13:02:27 2015
New Revision: 1681101

URL: http://svn.apache.org/r1681101
Log:
Use explicit cast to avoid compiler warnings:

src/sslcontext.c:895:46: warning: pointer targets in passing argument 5 of 
'(*e)->GetByteArrayRegion' differ in signedness [-Wpointer-sign]
     (*e)->GetByteArrayRegion(e, buf, 0, len, &sslctx->alpn[0]);
                                              ^
src/sslcontext.c:895:46: note: expected 'jbyte *' but argument is of type 'char 
*'

src/sslnetwork.c:703:46: warning: pointer targets in passing argument 5 of 
'(*e)->SetByteArrayRegion' differ in signedness [-Wpointer-sign]
     (*e)->SetByteArrayRegion(e, buf, 0, len, alpn);
                                              ^
src/sslnetwork.c:703:46: note: expected 'const jbyte *' but argument is of type 
'const unsigned char *'

Modified:
    tomcat/native/trunk/native/src/sslcontext.c
    tomcat/native/trunk/native/src/sslnetwork.c

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1681101&r1=1681100&r2=1681101&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Fri May 22 13:02:27 2015
@@ -891,7 +891,7 @@ TCN_IMPLEMENT_CALL(jint, SSLContext, set
     tcn_ssl_ctxt_t *sslctx = J2P(ctx, tcn_ssl_ctxt_t *);
 
     sslctx->alpn = apr_pcalloc(sslctx->pool, len);
-    (*e)->GetByteArrayRegion(e, buf, 0, len, &sslctx->alpn[0]);
+    (*e)->GetByteArrayRegion(e, buf, 0, len, (jbyte *)&sslctx->alpn[0]);
     sslctx->alpnlen = len;
 
     if (sslctx->mode == SSL_MODE_SERVER) {

Modified: tomcat/native/trunk/native/src/sslnetwork.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslnetwork.c?rev=1681101&r1=1681100&r2=1681101&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslnetwork.c (original)
+++ tomcat/native/trunk/native/src/sslnetwork.c Fri May 22 13:02:27 2015
@@ -700,7 +700,7 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, getA
         return 0;
     }
     int len = alpn_len;
-    (*e)->SetByteArrayRegion(e, buf, 0, len, alpn);
+    (*e)->SetByteArrayRegion(e, buf, 0, len, (jbyte *)alpn);
 
     return len;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org