commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r810867 - in /commons/sandbox/runtime/trunk/src/main/native: include/arch/unix/ include/arch/windows/ os/darwin/ os/hpux/ os/unix/ os/win32/ shared/
Date Thu, 03 Sep 2009 10:24:20 GMT
Author: mturk
Date: Thu Sep  3 10:24:19 2009
New Revision: 810867

URL: http://svn.apache.org/viewvc?rev=810867&view=rev
Log:
Rename IOH macros. No functional change

Modified:
    commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
    commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
    commons/sandbox/runtime/trunk/src/main/native/os/darwin/pmutex.c
    commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c
    commons/sandbox/runtime/trunk/src/main/native/os/unix/dso.c
    commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c
    commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c
    commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c
    commons/sandbox/runtime/trunk/src/main/native/os/unix/pshm.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/psema.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c
    commons/sandbox/runtime/trunk/src/main/native/shared/cmnfile.c

Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/unix/acr_arch.h Thu Sep  3
10:24:19 2009
@@ -75,9 +75,9 @@
 /** Default number of IO slots
  */
 #define ACR_IOH_SLOTS       (64 * 1024)
-#define ACR_IOH_TYPE(H)     acr_ioh_tab[(H) & acr_ioh_mask].type
+#define ACR_IOH_FTYPE(H)    acr_ioh_tab[(H) & acr_ioh_mask].type
 #define ACR_IOH_FLAGS(H)    acr_ioh_tab[(H) & acr_ioh_mask].flags
-#define ACR_IOH(H)          acr_ioh_tab[(H) & acr_ioh_mask].h
+#define ACR_IOH_FDATA(H)    acr_ioh_tab[(H) & acr_ioh_mask].h
 
 static ACR_INLINE void x_free(void *p)
 {

Modified: commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h Thu Sep
 3 10:24:19 2009
@@ -296,9 +296,9 @@
 /** Default number of IO slots
  */
 #define ACR_IOH_SLOTS       (64 * 1024)
-#define ACR_IOH_TYPE(H)     acr_ioh_tab[(H) & acr_ioh_mask].type
+#define ACR_IOH_FTYPE(H)    acr_ioh_tab[(H) & acr_ioh_mask].type
 #define ACR_IOH_FLAGS(H)    acr_ioh_tab[(H) & acr_ioh_mask].flags
-#define ACR_IOH(H)          acr_ioh_tab[(H) & acr_ioh_mask].h
+#define ACR_IOH_FDATA(H)    acr_ioh_tab[(H) & acr_ioh_mask].h
 
 static ACR_INLINE void FileTimeToUsecTime(acr_time_t *result, LPFILETIME input)
 {
@@ -330,6 +330,7 @@
     if (size > 0 && size < INT_MAX)
         return malloc(size);
     else {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
         errno = ENOMEM;
         return NULL;
     }
@@ -340,6 +341,7 @@
     if (size > 0 && size < INT_MAX)
         return calloc(1, size);
     else {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
         errno = ENOMEM;
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/pmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/pmutex.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/pmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/pmutex.c Thu Sep  3 10:24:19 2009
@@ -267,9 +267,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -294,9 +294,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -327,9 +327,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -354,9 +354,9 @@
 {
     union  semun ick;
     struct semid_ds buf;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -538,9 +538,9 @@
 {
     int rc;
     struct flock op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -568,9 +568,9 @@
 {
     int rc;
     struct flock op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -601,9 +601,9 @@
 {
     int rc;
     struct flock op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -628,9 +628,9 @@
 ACR_DECLARE(int) ACR_ProcMutexPermSet(JNIEnv *_E, int mutex, int perms,
                                       acr_uid_t uid, acr_uid_t gid)
 {
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -662,7 +662,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/pshm.c Thu Sep  3 10:24:19 2009
@@ -140,7 +140,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -424,9 +424,9 @@
 ACR_DECLARE(int) ACR_ShmDetach(JNIEnv *_E, int shm)
 {
     int rc = 0;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -449,9 +449,9 @@
     int rc = 0;
     struct shmid_ds shmbuf;
     int shmid;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -474,9 +474,9 @@
 
 ACR_DECLARE(void *) ACR_ShmGetBaseAddr(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return NULL;
     }
@@ -490,8 +490,8 @@
 
 ACR_DECLARE(acr_size_t) ACR_ShmGetSize(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return 0;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/dso.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/dso.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/dso.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/dso.c Thu Sep  3 10:24:19 2009
@@ -68,7 +68,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(dso) != ACR_DT_DSO) {
+    if (ACR_IOH_FTYPE(dso) != ACR_DT_DSO) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -80,9 +80,9 @@
 ACR_DECLARE(void *) ACR_DsoSym(JNIEnv *_E, int dso, const char *symname)
 {
     int rc;
-    void *handle = ACR_IOH(dso);
+    void *handle = ACR_IOH_FDATA(dso);
 
-    if (ACR_IOH_TYPE(dso) != ACR_DT_DSO) {
+    if (ACR_IOH_FTYPE(dso) != ACR_DT_DSO) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pmmap.c Thu Sep  3 10:24:19 2009
@@ -102,8 +102,8 @@
         break;
         case ACR_DESC_FLUSH:
             if (dp->di > 0) {
-                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(dp->di);
-                if (ACR_IOH_TYPE(dp->di) != ACR_DT_MMAP)
+                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(dp->di);
+                if (ACR_IOH_FTYPE(dp->di) != ACR_DT_MMAP)
                     rc = ACR_EFTYPE;
                 else {
                     if (IS_VALID_HANDLE(m->base)) {
@@ -118,8 +118,8 @@
                 rc = ACR_EBADF;
         case ACR_DESC_SYNC:
             if (dp->di > 0) {
-                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(dp->di);
-                if (ACR_IOH_TYPE(dp->di) != ACR_DT_MMAP)
+                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(dp->di);
+                if (ACR_IOH_FTYPE(dp->di) != ACR_DT_MMAP)
                     rc = ACR_EFTYPE;
                 else {
                     if (IS_VALID_HANDLE(m->base)) {
@@ -146,7 +146,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -161,8 +161,8 @@
     acr_mmap_t *map;
     acr_file_t *file;
 
-    file = (acr_file_t *)ACR_IOH(fd);
-    if (ACR_IOH_TYPE(fd) != ACR_DT_FILE) {
+    file = (acr_file_t *)ACR_IOH_FDATA(fd);
+    if (ACR_IOH_FTYPE(fd) != ACR_DT_FILE) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return -1;
     }
@@ -230,9 +230,9 @@
 ACR_DECLARE(void *) ACR_MMap(JNIEnv *_E, int map, acr_off_t offset,
                              acr_size_t size)
 {
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }
@@ -261,9 +261,9 @@
 
 ACR_DECLARE(int) ACR_MUnmap(JNIEnv *_E, int map)
 {
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -390,9 +390,9 @@
 {
     void   *base  = NULL;
     jobject mptr  = NULL;
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }
@@ -417,9 +417,9 @@
     jobject mptr  = NULL;
     struct  stat  s;
     off_t   size;
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pmutex.c Thu Sep  3 10:24:19 2009
@@ -284,9 +284,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -311,9 +311,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -344,9 +344,9 @@
 {
     int rc;
     struct sembuf op;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -372,9 +372,9 @@
 {
     union  semun ick;
     struct semid_ds buf;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -559,9 +559,9 @@
 ACR_DECLARE(int) ACR_ProcMutexLock(JNIEnv *_E, int mutex)
 {
     int rc;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -581,9 +581,9 @@
 ACR_DECLARE(int) ACR_ProcMutexTryLock(JNIEnv *_E, int mutex)
 {
     int rc;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -606,9 +606,9 @@
 ACR_DECLARE(int) ACR_ProcMutexRelease(JNIEnv *_E, int mutex)
 {
     int rc;
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -629,9 +629,9 @@
 ACR_DECLARE(int) ACR_ProcMutexPermSet(JNIEnv *_E, int mutex, int perms,
                                       acr_uid_t uid, acr_uid_t gid)
 {
-    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH(mutex);
+    acr_pmutex_t *m = (acr_pmutex_t *)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -689,7 +689,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/psema.c Thu Sep  3 10:24:19 2009
@@ -206,9 +206,9 @@
 ACR_DECLARE(int) ACR_SemaphorePermSet(JNIEnv *_E, int sema, int perms,
                                       acr_uid_t uid, acr_uid_t gid)
 {
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(s)) {
@@ -220,9 +220,9 @@
 ACR_DECLARE(int) ACR_SemaphoreWait(JNIEnv *_E, int sema)
 {
     int rc = 0;
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(s)) {
@@ -243,9 +243,9 @@
 ACR_DECLARE(int) ACR_SemaphoreTryWait(JNIEnv *_E, int sema)
 {
     int rc = 0;
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(s)) {
@@ -269,9 +269,9 @@
 ACR_DECLARE(int) ACR_SemaphoreReset(JNIEnv *_E, int sema)
 {
     int rc = 0;
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(s)) {
@@ -302,9 +302,9 @@
 ACR_DECLARE(int) ACR_SemaphoreRelease(JNIEnv *env, int sema)
 {
     int rc = 0;
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(s)) {

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pshm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pshm.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/pshm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pshm.c Thu Sep  3 10:24:19 2009
@@ -139,7 +139,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -398,9 +398,9 @@
 ACR_DECLARE(int) ACR_ShmDetach(JNIEnv *_E, int shm)
 {
     int rc = 0;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -424,9 +424,9 @@
     int rc = 0;
     struct shmid_ds shmbuf;
     int shmid;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -453,9 +453,9 @@
 
 ACR_DECLARE(void *) ACR_ShmGetBaseAddr(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return NULL;
     }
@@ -469,8 +469,8 @@
 
 ACR_DECLARE(acr_size_t) ACR_ShmGetSize(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return 0;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dso.c Thu Sep  3 10:24:19 2009
@@ -41,7 +41,7 @@
     UINT      em;
     int       rc = 0;
 
-    /* Do not display message box */ 
+    /* Do not display message box */
     em = SetErrorMode(SEM_FAILCRITICALERRORS);
 
     handle = LoadLibraryExW(path, NULL, 0);
@@ -62,7 +62,7 @@
                 }
         }
     }
-    /* Restore original error mode */ 
+    /* Restore original error mode */
     SetErrorMode(em);
     if (rc) {
         ACR_THROW_IO_IF_ERR(rc);
@@ -76,7 +76,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(dso) != ACR_DT_DSO) {
+    if (ACR_IOH_FTYPE(dso) != ACR_DT_DSO) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -88,9 +88,9 @@
 ACR_DECLARE(void *) ACR_DsoSym(JNIEnv *_E, int dso, const char *symname)
 {
     int rc;
-    void *handle = ACR_IOH(dso);
+    void *handle = ACR_IOH_FDATA(dso);
 
-    if (ACR_IOH_TYPE(dso) != ACR_DT_DSO) {
+    if (ACR_IOH_FTYPE(dso) != ACR_DT_DSO) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pmmap.c Thu Sep  3 10:24:19 2009
@@ -104,8 +104,8 @@
         case ACR_DESC_FLUSH:
         case ACR_DESC_SYNC:
             if (dp->di > 0) {
-                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(dp->di);
-                if (ACR_IOH_TYPE(dp->di) != ACR_DT_MMAP)
+                acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(dp->di);
+                if (ACR_IOH_FTYPE(dp->di) != ACR_DT_MMAP)
                     rc = ACR_EFTYPE;
                 else {
                     if (IS_VALID_HANDLE(m->base)) {
@@ -131,7 +131,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -147,8 +147,8 @@
     acr_file_t *file;
     DWORD prot = 0;
 
-    file = (acr_file_t *)ACR_IOH(fd);
-    if (ACR_IOH_TYPE(fd) != ACR_DT_FILE) {
+    file = (acr_file_t *)ACR_IOH_FDATA(fd);
+    if (ACR_IOH_FTYPE(fd) != ACR_DT_FILE) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return -1;
     }
@@ -255,9 +255,9 @@
                              acr_size_t size)
 {
     LARGE_INTEGER off;
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }
@@ -287,9 +287,9 @@
 
 ACR_DECLARE(int) ACR_MUnmap(JNIEnv *_E, int map)
 {
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -417,9 +417,9 @@
     LARGE_INTEGER off;
     void   *base  = NULL;
     jobject mptr  = NULL;
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }
@@ -447,9 +447,9 @@
     void   *base  = NULL;
     jobject mptr  = NULL;
     size_t  size;
-    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH(map);
+    acr_mmap_t *m = (acr_mmap_t *)ACR_IOH_FDATA(map);
 
-    if (ACR_IOH_TYPE(map) != ACR_DT_MMAP) {
+    if (ACR_IOH_FTYPE(map) != ACR_DT_MMAP) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return NULL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pmutex.c Thu Sep  3 10:24:19 2009
@@ -120,8 +120,8 @@
     HANDLE wh[2];
 
     wh[0] = dll_psig_handle;
-    wh[1] = (HANDLE)ACR_IOH(mutex);
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    wh[1] = (HANDLE)ACR_IOH_FDATA(mutex);
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(wh[0])) {
@@ -162,9 +162,9 @@
 ACR_DECLARE(int) ACR_ProcMutexTryLock(JNIEnv *_E, int mutex)
 {
     int rc;
-    HANDLE m = (HANDLE)ACR_IOH(mutex);
+    HANDLE m = (HANDLE)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -183,9 +183,9 @@
 
 ACR_DECLARE(int) ACR_ProcMutexRelease(JNIEnv *_E, int mutex)
 {
-    HANDLE m = (HANDLE)ACR_IOH(mutex);
+    HANDLE m = (HANDLE)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -200,9 +200,9 @@
 ACR_DECLARE(int) ACR_ProcMutexPermSet(JNIEnv *_E, int mutex, int perms,
                                       acr_uid_t uid, acr_uid_t gid)
 {
-    HANDLE m = (HANDLE)ACR_IOH(mutex);
+    HANDLE m = (HANDLE)ACR_IOH_FDATA(mutex);
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         return ACR_EFTYPE;
     }
     if (IS_INVALID_HANDLE(m)) {
@@ -215,7 +215,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(mutex) != ACR_DT_MUTEX) {
+    if (ACR_IOH_FTYPE(mutex) != ACR_DT_MUTEX) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EINVAL;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/psema.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/psema.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/psema.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/psema.c Thu Sep  3 10:24:19 2009
@@ -134,9 +134,9 @@
                                       acr_uid_t uid, acr_uid_t gid)
 {
     int rc = 0;
-    HANDLE s = (HANDLE)ACR_IOH(sema);
+    HANDLE s = (HANDLE)ACR_IOH_FDATA(sema);
 
-    if (IS_INVALID_HANDLE(s) || ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (IS_INVALID_HANDLE(s) || ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EINVAL;
     }
     return ACR_ENOTIMPL;
@@ -147,9 +147,9 @@
     int rc;
     DWORD  ws;
     HANDLE wh[2];
-    HANDLE s = (HANDLE)ACR_IOH(sema);
+    HANDLE s = (HANDLE)ACR_IOH_FDATA(sema);
 
-    if (ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE || IS_INVALID_HANDLE(s)) {
+    if (ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE || IS_INVALID_HANDLE(s)) {
         return ACR_EINVAL;
     }
 
@@ -190,9 +190,9 @@
 ACR_DECLARE(int) ACR_SemaphoreTryWait(JNIEnv *_E, int sema)
 {
     int rc;
-    HANDLE s = (HANDLE)ACR_IOH(sema);
+    HANDLE s = (HANDLE)ACR_IOH_FDATA(sema);
 
-    if (IS_INVALID_HANDLE(s) || ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (IS_INVALID_HANDLE(s) || ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EINVAL;
     }
     rc = WaitForSingleObject(s, 0);
@@ -210,9 +210,9 @@
 {
     int nc = 0;
     int rc = 0;
-    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH(sema);
+    acr_semaphore_t *s = (acr_semaphore_t *)ACR_IOH_FDATA(sema);
 
-    if (IS_INVALID_HANDLE(s) || ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (IS_INVALID_HANDLE(s) || ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EINVAL;
     }
 
@@ -234,9 +234,9 @@
 ACR_DECLARE(int) ACR_SemaphoreRelease(JNIEnv *env, int sema)
 {
     int rc = 0;
-    HANDLE s = (HANDLE)ACR_IOH(sema);
+    HANDLE s = (HANDLE)ACR_IOH_FDATA(sema);
 
-    if (IS_INVALID_HANDLE(s) || ACR_IOH_TYPE(sema) != ACR_DT_SEMAPHORE) {
+    if (IS_INVALID_HANDLE(s) || ACR_IOH_FTYPE(sema) != ACR_DT_SEMAPHORE) {
         return ACR_EINVAL;
     }
 

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pshm.c Thu Sep  3 10:24:19 2009
@@ -87,7 +87,7 @@
 {
     int rc;
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_THROW_EX_IF_ERR(ACR_EX_EINVAL, ACR_EFTYPE);
         return ACR_EFTYPE;
     }
@@ -313,9 +313,9 @@
 ACR_DECLARE(int) ACR_ShmDetach(JNIEnv *_E, int shm)
 {
     int rc;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -337,9 +337,9 @@
                                 acr_uid_t uid, acr_uid_t gid)
 {
     int rc = 0;
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         rc = ACR_EFTYPE;
         goto finally;
     }
@@ -355,9 +355,9 @@
 
 ACR_DECLARE(void *) ACR_ShmGetBaseAddr(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
 
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return NULL;
     }
@@ -371,8 +371,8 @@
 
 ACR_DECLARE(acr_size_t) ACR_ShmGetSize(int shm)
 {
-    acr_shm_t *m = (acr_shm_t *)ACR_IOH(shm);
-    if (ACR_IOH_TYPE(shm) != ACR_DT_SHM) {
+    acr_shm_t *m = (acr_shm_t *)ACR_IOH_FDATA(shm);
+    if (ACR_IOH_FTYPE(shm) != ACR_DT_SHM) {
         ACR_SET_OS_ERROR(ACR_EFTYPE);
         return 0;
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/shared/cmnfile.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/cmnfile.c?rev=810867&r1=810866&r2=810867&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/cmnfile.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/cmnfile.c Thu Sep  3 10:24:19 2009
@@ -33,9 +33,9 @@
 
 ACR_DECLARE(const acr_pchar_t *) ACR_FileNameGet(JNIEnv *_E, int fd)
 {
-    acr_file_t *fp = (acr_file_t *)ACR_IOH(fd);
+    acr_file_t *fp = (acr_file_t *)ACR_IOH_FDATA(fd);
 
-    if (IS_INVALID_HANDLE(fp) || ACR_IOH_TYPE(fd) != ACR_DT_FILE) {
+    if (IS_INVALID_HANDLE(fp) || ACR_IOH_FTYPE(fd) != ACR_DT_FILE) {
         ACR_THROW_IO_IF_ERR(ACR_EBADF);
         return NULL;
     }



Mime
View raw message