diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-19 20:15:21 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-04-19 20:15:21 (GMT) |
commit | 099b37d073e633b0cb4d8c3f41ddf5788e63e6ee (patch) | |
tree | 3316f03ab81dbbab9160aac62fefe3f78b50c1d4 /src/H5Sselect.c | |
parent | 94cf912176257c753eaddde0acabc9a11be2e48d (diff) | |
download | hdf5-099b37d073e633b0cb4d8c3f41ddf5788e63e6ee.zip hdf5-099b37d073e633b0cb4d8c3f41ddf5788e63e6ee.tar.gz hdf5-099b37d073e633b0cb4d8c3f41ddf5788e63e6ee.tar.bz2 |
[svn-r20559] Description:
Bring r20407:20557 from trunk to revise_chunks branch
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (ember) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Diffstat (limited to 'src/H5Sselect.c')
-rw-r--r-- | src/H5Sselect.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 2a0e63f..db18780 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -874,13 +874,13 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_init) /* Check args */ - assert(sel_iter); - assert(space); + HDassert(sel_iter); + HDassert(space); /* Initialize common information */ /* Save the dataspace's rank */ - sel_iter->rank=space->extent.rank; + sel_iter->rank = space->extent.rank; /* Point to the dataspace dimensions, if there are any */ if(sel_iter->rank > 0) @@ -889,10 +889,11 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s sel_iter->dims = NULL; /* Save the element size */ - sel_iter->elmt_size=elmt_size; + sel_iter->elmt_size = elmt_size; /* Call initialization routine for selection type */ - ret_value= (*space->select.type->iter_init)(sel_iter, space); + ret_value = (*space->select.type->iter_init)(sel_iter, space); + HDassert(sel_iter->type); FUNC_LEAVE_NOAPI(ret_value) } /* H5S_select_iter_init() */ |