Author: mturk
Date: Wed Dec 13 23:14:15 2006
New Revision: 487043
URL: http://svn.apache.org/viewvc?view=rev&rev=487043
Log:
Fix compile time warnings reported by Peter on OS/X
No functional changes.
Modified:
tomcat/connectors/trunk/jni/native/src/network.c
Modified: tomcat/connectors/trunk/jni/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/network.c?view=diff&rev=487043&r1=487042&r2=487043
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/network.c (original)
+++ tomcat/connectors/trunk/jni/native/src/network.c Wed Dec 13 23:14:15 2006
@@ -439,14 +439,14 @@
if (tosend <= TCN_BUFFER_SZ) {
jbyte sb[TCN_BUFFER_SZ];
(*e)->GetByteArrayRegion(e, buf, offset, tosend, &sb[0]);
- ss = (*s->net->send)(s->opaque, sb, &nbytes);
+ ss = (*s->net->send)(s->opaque, (const char *)&sb[0], &nbytes);
}
else {
jbyte *sb = (jbyte *)malloc(nbytes);
if (sb == NULL)
return -APR_ENOMEM;
(*e)->GetByteArrayRegion(e, buf, offset, tosend, sb);
- ss = (*s->net->send)(s->opaque, sb, &nbytes);
+ ss = (*s->net->send)(s->opaque, (const char *)sb, &nbytes);
free(sb);
}
if (ss == APR_SUCCESS)
@@ -719,14 +719,14 @@
}
if (toread <= TCN_BUFFER_SZ) {
jbyte sb[TCN_BUFFER_SZ];
- if ((ss = (*s->net->recv)(s->opaque, sb, &nbytes)) == APR_SUCCESS)
+ if ((ss = (*s->net->recv)(s->opaque, (char *)&sb[0], &nbytes)) ==
APR_SUCCESS)
(*e)->SetByteArrayRegion(e, buf, offset, (jsize)nbytes, &sb[0]);
}
else {
jbyte *sb = (jbyte *)malloc(nbytes);
if (sb == NULL)
return -APR_ENOMEM;
- if ((ss = (*s->net->recv)(s->opaque, sb, &nbytes)) == APR_SUCCESS)
+ if ((ss = (*s->net->recv)(s->opaque, (char *)sb, &nbytes)) ==
APR_SUCCESS)
(*e)->SetByteArrayRegion(e, buf, offset, (jsize)nbytes, &sb[0]);
free(sb);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
