[svn-r22287] Description:

    Clean up more FUNC_ENTER/FUNC_LEAVE macros and move H5D & H5T code toward
the final design (as exemplified by the H5EA & H5FA code).

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug & parallel

1 files changed, 10 insertions, 10 deletions

diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 1b602c7..6158fd9 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -84,7 +84,7 @@ static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
 #define H5O_DTYPE_CHECK_VERSION(DT, VERS, MIN_VERS, IOF, CLASS, ERR)           \
     if(((VERS) < (MIN_VERS)) && !(*(IOF) & H5O_DECODEIO_NOCHANGE)) {           \
         (VERS) = (MIN_VERS);                                                   \
-        if(H5T_upgrade_version((DT), (VERS)) < 0)                              \
+        if(H5T__upgrade_version((DT), (VERS)) < 0)                              \
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade " CLASS " encoding version") \
         *(IOF) |= H5O_DECODEIO_DIRTY;                                          \
     } /* end if */
@@ -325,7 +325,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
                     } /* end if */
 
                     /* Allocate space for the field's datatype */
-                    if(NULL == (temp_type = H5T_alloc()))
+                    if(NULL == (temp_type = H5T__alloc()))
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
                     /* Decode the field's datatype information */
@@ -349,7 +349,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
                         /* Check if this member is an array field */
                         if(ndims > 0) {
                             /* Create the array datatype for the field */
-                            if((array_dt = H5T_array_create(temp_type, ndims, dim)) == NULL) {
+                            if((array_dt = H5T__array_create(temp_type, ndims, dim)) == NULL) {
                                 for(j = 0; j <= i; j++)
                                     H5MM_xfree(dt->shared->u.compnd.memb[j].name);
                                 H5MM_xfree(dt->shared->u.compnd.memb);
@@ -409,12 +409,12 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
                 } /* end for */
 
                 /* Check if the compound type is packed */
-                H5T_update_packed(dt);
+                H5T__update_packed(dt);
 
                 /* Upgrade the compound if requested */
                 if(version < upgrade_to) {
                     version = upgrade_to;
-                    if(H5T_upgrade_version(dt, upgrade_to) < 0)
+                    if(H5T__upgrade_version(dt, upgrade_to) < 0)
                         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't upgrade compound encoding version")
                     /* We won't mark the message dirty since there were no
                      * errors in the file, simply type versions that we will no
@@ -453,7 +453,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
              * Enumeration datatypes...
              */
             dt->shared->u.enumer.nmembs = dt->shared->u.enumer.nalloc = flags & 0xffff;
-            if(NULL == (dt->shared->parent = H5T_alloc()))
+            if(NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
             if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode parent datatype")
@@ -495,7 +495,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
             } /* end if */
 
             /* Decode base type of VL information */
-            if(NULL == (dt->shared->parent = H5T_alloc()))
+            if(NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "memory allocation failed")
             if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode VL parent type")
@@ -535,7 +535,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
                 *pp += dt->shared->u.array.ndims * 4;
 
             /* Decode base type of array */
-            if(NULL == (dt->shared->parent = H5T_alloc()))
+            if(NULL == (dt->shared->parent = H5T__alloc()))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "memory allocation failed")
             if(H5O_dtype_decode_helper(f, ioflags, pp, dt->shared->parent) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "unable to decode array parent type")
@@ -1097,7 +1097,7 @@ H5O_dtype_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, unsigned
     HDassert(p);
 
     /* Allocate datatype message */
-    if(NULL == (dt = H5T_alloc()))
+    if(NULL == (dt = H5T__alloc()))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Perform actual decode of message */
@@ -1358,7 +1358,7 @@ H5O_dtype_reset(void *_mesg)
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     if(dt)
-        H5T_free(dt);
+        H5T__free(dt);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_reset() */