diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 19:33:59 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 19:33:59 (GMT) |
| commit | 7143164de9d7de52516697bbb6bfc7cd2cf749d6 (patch) | |
| tree | 107977d9f4732e672d5690072a2e85d82e1ebf28 /src/H5Tarray.c | |
| parent | 74e00605264ffb2b782b4f28be15accc7784217c (diff) | |
| download | hdf5-7143164de9d7de52516697bbb6bfc7cd2cf749d6.zip hdf5-7143164de9d7de52516697bbb6bfc7cd2cf749d6.tar.gz hdf5-7143164de9d7de52516697bbb6bfc7cd2cf749d6.tar.bz2 | |
[svn-r22608] Description:
Switch propert list/class iteration from internal to external form of
iteration, cleaning up and simplifying the code a bit.
Bring other general improvements from plist_encode_decode branch back to
trunk.
Clean up many warnings.
Tested on:
Mac OSX/64 10.7.4 (amazon) w/gcc 4.7, debug and C++ & FORTRAN
(too minor to require h5committest)
Diffstat (limited to 'src/H5Tarray.c')
| -rw-r--r-- | src/H5Tarray.c | 10 |
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 |