summaryrefslogtreecommitdiffstats
path: root/src/H5Tarray.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-04-17 20:59:36 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-04-17 20:59:36 (GMT)
commit34ada2e41da08bede1962abf5415f41d795c5ee6 (patch)
tree523dd0c825a79ae37d89021a1a720ca5fc69b303 /src/H5Tarray.c
parente12e4936e929ae0dcb1d65acf6bedb422acca01a (diff)
downloadhdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.zip
hdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.tar.gz
hdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.tar.bz2
[svn-r22291] Description:
Bring r22287 from trunk to 1.8 branch: 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
Diffstat (limited to 'src/H5Tarray.c')
-rw-r--r--src/H5Tarray.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index 714ecc9..e9c8fe7 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -142,7 +142,7 @@ H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */])
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
/* Create the array datatype */
- if(NULL == (dt = H5T_array_create(base, ndims, dim)))
+ if(NULL == (dt = H5T__array_create(base, ndims, dim)))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to create datatype")
/* Atomize the type */
@@ -160,7 +160,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5T_array_create
+ * Function: H5T__array_create
*
* Purpose: Internal routine to create a new array data type based on the
* specified BASE_TYPE. The type is an array with NDIMS dimensionality
@@ -177,19 +177,19 @@ done:
*-------------------------------------------------------------------------
*/
H5T_t *
-H5T_array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
+H5T__array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
{
H5T_t *ret_value; /* new array data type */
unsigned u; /* local index variable */
- FUNC_ENTER_NOAPI(NULL)
+ FUNC_ENTER_PACKAGE
HDassert(base);
HDassert(ndims <= H5S_MAX_RANK);
HDassert(dim);
/* Build new type */
- if(NULL == (ret_value = H5T_alloc()))
+ if(NULL == (ret_value = H5T__alloc()))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
ret_value->shared->type = H5T_ARRAY;
@@ -217,7 +217,7 @@ H5T_array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_array_create */
+} /* end H5T__array_create */
/*-------------------------------------------------------------------------
@@ -249,7 +249,7 @@ H5Tget_array_ndims(hid_t type_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
/* Retrieve the number of dimensions */
- ret_value = H5T_get_array_ndims(dt);
+ ret_value = H5T__get_array_ndims(dt);
done:
FUNC_LEAVE_API(ret_value)
@@ -257,9 +257,9 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5T_get_array_ndims
+ * Function: H5T__get_array_ndims
*
- * Purpose: Private function for H5T_get_array_ndims. Query the number
+ * Purpose: Private function for H5T__get_array_ndims. Query the number
* of dimensions for an array datatype.
*
* Return: Success: Number of dimensions of the array datatype
@@ -271,16 +271,16 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5T_get_array_ndims(const H5T_t *dt)
+H5T__get_array_ndims(const H5T_t *dt)
{
- FUNC_ENTER_NOAPI_NOINIT_NOERR
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(dt);
HDassert(dt->shared->type == H5T_ARRAY);
/* Retrieve the number of dimensions */
FUNC_LEAVE_NOAPI(dt->shared->u.array.ndims)
-} /* end H5T_get_array_ndims */
+} /* end H5T__get_array_ndims */
/*-------------------------------------------------------------------------
@@ -312,7 +312,7 @@ H5Tget_array_dims2(hid_t type_id, hsize_t dims[])
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
/* Retrieve the sizes of the dimensions */
- if((ret_value = H5T_get_array_dims(dt, dims)) < 0)
+ if((ret_value = H5T__get_array_dims(dt, dims)) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get dimension sizes")
done:
FUNC_LEAVE_API(ret_value)
@@ -320,9 +320,9 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5T_get_array_dims
+ * Function: H5T__get_array_dims
*
- * Purpose: Private function for H5T_get_array_dims. Query the sizes
+ * Purpose: Private function for H5T__get_array_dims. Query the sizes
* of dimensions for an array datatype.
*
* Return: Success: Number of dimensions of the array type
@@ -334,12 +334,12 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5T_get_array_dims(const H5T_t *dt, hsize_t dims[])
+H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
{
unsigned u; /* Local index variable */
int ret_value; /* return value */
- FUNC_ENTER_NOAPI(FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(dt);
HDassert(dt->shared->type == H5T_ARRAY);
@@ -354,7 +354,7 @@ H5T_get_array_dims(const H5T_t *dt, hsize_t dims[])
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_get_array_dims */
+} /* end H5T__get_array_dims */
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -401,7 +401,7 @@ H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an valid base datatype")
/* Create the array datatype */
- if(NULL == (dt = H5T_array_create(base, (unsigned)ndims, dim)))
+ if(NULL == (dt = H5T__array_create(base, (unsigned)ndims, dim)))
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to create datatype")
/* Atomize the type */
@@ -447,7 +447,7 @@ H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int UNUSED perm[])
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an array datatype")
/* Retrieve the sizes of the dimensions */
- if((ret_value = H5T_get_array_dims(dt, dims)) < 0)
+ if((ret_value = H5T__get_array_dims(dt, dims)) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get dimension sizes")
done: