Author: mturk
Date: Sat Apr 25 07:00:16 2009
New Revision: 768481
URL: http://svn.apache.org/viewvc?rev=768481&view=rev
Log:
Use our macros for pointer/jnipt/pointer casting
Modified:
commons/sandbox/runtime/trunk/src/main/native/shared/descriptor.c
commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/descriptor.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/descriptor.c?rev=768481&r1=768480&r2=768481&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/descriptor.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/descriptor.c Sat Apr
25 07:00:16 2009
@@ -133,9 +133,9 @@
SET_IFIELD_I(0000, _O, -1);
}
- callback = (acr_descriptor_callback_fn_t *)((acr_ptr_t)c);
+ callback = N2P(c, acr_descriptor_callback_fn_t *);
if (callback) {
- int rc = (*callback)(ACR_DESC_CLOSE, i, (void *)((acr_ptr_t)p));
+ int rc = (*callback)(ACR_DESC_CLOSE, i, N2P(p, void *));
if (rc) {
/* Throw IOException with errno message */
ACR_ThrowException(_E, THROW_FMARK, ACR_EX_EIO, rc);
@@ -161,9 +161,9 @@
SET_IFIELD_I(0000, _O, -1);
}
- callback = (acr_descriptor_callback_fn_t *)((acr_ptr_t)c);
+ callback = N2P(c, acr_descriptor_callback_fn_t *);
if (callback) {
- (*callback)(ACR_DESC_CLOSE, i, (void *)((acr_ptr_t)p));
+ (*callback)(ACR_DESC_CLOSE, i, N2P(p, void *));
}
}
}
@@ -176,9 +176,9 @@
jniptr p = GET_IFIELD_P(0001, _O);
jniptr c = GET_IFIELD_P(0002, _O);
- callback = (acr_descriptor_callback_fn_t *)((acr_ptr_t)c);
+ callback = N2P(c, acr_descriptor_callback_fn_t *);
if (callback) {
- int rc = (*callback)(ACR_DESC_SYNC, i, (void *)((acr_ptr_t)p));
+ int rc = (*callback)(ACR_DESC_SYNC, i, N2P(p, void *));
if (rc) {
if (rc == ACR_EINVAL)
ACR_ThrowException(_E, THROW_NMARK, ACR_EX_ESYNC, 0);
@@ -197,7 +197,7 @@
{
if (_clazzn.i && J4MID(0000))
return (*_E)->NewObject(_E, _clazzn.i, J4MID(0000),
- (jint)i, (acr_ptr_t)p, (acr_ptr_t)cb);
+ (jint)i, P2N(p), P2N(cb));
else {
ACR_SET_OS_ERROR(ACR_ECLASSNOTFOUND);
return NULL;
@@ -230,9 +230,9 @@
}
(*_E)->MonitorExit(_E, _O);
- callback = (acr_descriptor_callback_fn_t *)((acr_ptr_t)c);
+ callback = N2P(c, acr_descriptor_callback_fn_t *);
if (callback) {
- return (*callback)(ACR_DESC_CLOSE, i, (void *)((acr_ptr_t)p));
+ return (*callback)(ACR_DESC_CLOSE, i, N2P(p, void *));
}
else {
/* Already cleared */
@@ -247,7 +247,7 @@
{
if (_clazzn.i && J4MID(0000)) {
jniptr p = GET_IFIELD_P(0001, _O);
- return (void *)((acr_ptr_t)p);
+ return N2P(p, void *);
}
else {
ACR_SET_OS_ERROR(ACR_ECLASSNOTFOUND);
@@ -273,7 +273,7 @@
/* Object locking failed */
return ACR_ENOLOCK;
}
- SET_IFIELD_P(0001, _O, (jniptr)((acr_ptr_t)p));
+ SET_IFIELD_P(0001, _O, P2N(p));
#ifdef _JNI_CHECK_EXCEPTIONS
if ((*_E)->ExceptionCheck(_E)) {
return ACR_EGENERAL;
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c?rev=768481&r1=768480&r2=768481&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/pointer.c Sat Apr 25
07:00:16 2009
@@ -165,9 +165,9 @@
if (h) {
SET_IFIELD_P(0000, _O, 0);
}
- cleanup = (acr_pointer_cleanup_fn_t *)((acr_ptr_t)c);
+ cleanup = N2P(c, acr_pointer_cleanup_fn_t *);
if (cleanup) {
- (*cleanup)((void *)((acr_ptr_t)h));
+ (*cleanup)(N2P(h, void *));
}
}
}
@@ -176,28 +176,28 @@
{
UNREFERENCED_STDARGS;
- return *((char *)((acr_ptr_t)a));
+ return *(N2P(a, char *));
}
ACR_PTR_EXPORT_DECLARE(void, poke0)(ACR_JNISTDARGS, jniptr a, jint v)
{
UNREFERENCED_STDARGS;
- *((char *)((acr_ptr_t)a)) = v;
+ *(N2P(a, char *)) = v;
}
ACR_PTR_EXPORT_DECLARE(void, copy0)(ACR_JNISTDARGS, jniptr s,
jniptr d, jniptr l)
{
UNREFERENCED_STDARGS;
- memcpy((void *)((acr_ptr_t)d), (const void *)((acr_ptr_t)s), (size_t)l);
+ memcpy(N2P(d, void *), N2P(s, const void *), (size_t)l);
}
ACR_PTR_EXPORT_DECLARE(void, move0)(ACR_JNISTDARGS, jniptr s,
jniptr d, jniptr l)
{
UNREFERENCED_STDARGS;
- memmove((void *)((acr_ptr_t)d), (const void *)((acr_ptr_t)s), (size_t)l);
+ memmove(N2P(d, void *), N2P(s, const void *), (size_t)l);
}
ACR_PTR_EXPORT_DECLARE(void, copy1)(ACR_JNISTDARGS, jniptr a, jbyteArray dst,
@@ -205,8 +205,7 @@
{
UNREFERENCED_O;
- (*_E)->SetByteArrayRegion(_E, dst, (jsize)off, (jsize)len,
- (jbyte *)((acr_ptr_t)a));
+ (*_E)->SetByteArrayRegion(_E, dst, (jsize)off, (jsize)len, N2P(a, jbyte
*));
}
ACR_PTR_EXPORT_DECLARE(void, move1)(ACR_JNISTDARGS, jniptr a, jbyteArray src,
@@ -214,8 +213,7 @@
{
UNREFERENCED_O;
- (*_E)->GetByteArrayRegion(_E, src, (jsize)off, (jsize)len,
- (jbyte *)((acr_ptr_t)a));
+ (*_E)->GetByteArrayRegion(_E, src, (jsize)off, (jsize)len, N2P(a, jbyte
*));
}
@@ -224,7 +222,7 @@
{
if (_clazzn.i && J4MID(0000))
return (*_E)->NewObject(_E, _clazzn.i, J4MID(0000),
- (acr_ptr_t)p, (acr_ptr_t)cb, (acr_ptr_t)len);
+ P2N(p), P2N(cb), (acr_ptr_t)len);
else {
ACR_SET_OS_ERROR(ACR_ECLASSNOTFOUND);
return NULL;
@@ -251,9 +249,9 @@
SET_IFIELD_P(0001, _O, 0);
}
(*_E)->MonitorExit(_E, _O);
- cleanup = (acr_pointer_cleanup_fn_t *)((acr_ptr_t)c);
+ cleanup = N2P(c, acr_pointer_cleanup_fn_t *);
if (cleanup) {
- return (*cleanup)((void *)((acr_ptr_t)h));
+ return (*cleanup)(N2P(h, void *));
}
else {
/* Already cleared */
@@ -271,7 +269,7 @@
if (len) {
*len = (size_t)GET_IFIELD_P(0002, _O);
}
- return (void *)((acr_ptr_t)h);
+ return N2P(h, void *);
}
else {
ACR_SET_OS_ERROR(ACR_ECLASSNOTFOUND);
