summaryrefslogtreecommitdiffstats
path: root/src/H5Tarray.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-08-06 19:42:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-08-06 19:42:49 (GMT)
commitcd3f42096b9a957e37c9df48aa0d31d9ed4bc537 (patch)
tree86a1672d114762d3aea872e44104e65d1bc09254 /src/H5Tarray.c
parent434643dd4d14a841abdcc73ad7b3a0a8e06e4438 (diff)
downloadhdf5-cd3f42096b9a957e37c9df48aa0d31d9ed4bc537.zip
hdf5-cd3f42096b9a957e37c9df48aa0d31d9ed4bc537.tar.gz
hdf5-cd3f42096b9a957e37c9df48aa0d31d9ed4bc537.tar.bz2
[svn-r22636] Description:
Bring r22599:22634 from trunk to revise_chunks branch Tested on: Mac OSX/64 10.7.4 (amazon) w/gcc 4.7.x, C++ & FORTRAN (No need for h5committest yet on this branch)
Diffstat (limited to 'src/H5Tarray.c')
-rw-r--r--src/H5Tarray.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index e9c8fe7..9986631 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -279,7 +279,7 @@ H5T__get_array_ndims(const H5T_t *dt)
HDassert(dt->shared->type == H5T_ARRAY);
/* Retrieve the number of dimensions */
- FUNC_LEAVE_NOAPI(dt->shared->u.array.ndims)
+ FUNC_LEAVE_NOAPI((int)dt->shared->u.array.ndims)
} /* end H5T__get_array_ndims */
@@ -337,9 +337,8 @@ int
H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
{
unsigned u; /* Local index variable */
- int ret_value; /* return value */
- FUNC_ENTER_PACKAGE
+ FUNC_ENTER_PACKAGE_NOERR
HDassert(dt);
HDassert(dt->shared->type == H5T_ARRAY);
@@ -350,10 +349,7 @@ H5T__get_array_dims(const H5T_t *dt, hsize_t dims[])
dims[u] = dt->shared->u.array.dim[u];
/* Pass along the array rank as the return value */
- ret_value = dt->shared->u.array.ndims;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI((int)dt->shared->u.array.ndims)
} /* end H5T__get_array_dims */
#ifndef H5_NO_DEPRECATED_SYMBOLS