diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-06-13 06:23:57 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-06-13 06:23:57 (GMT) |
| commit | 4ccb865c70f977a4a97d75df3d6e792c8cbdfdd8 (patch) | |
| tree | 860f585f1589250b03aec29371acb13ebbf2e022 /src/H5Dint.c | |
| parent | c2bc22d51cdf528c9b04ec115ac22c7e79fd7c6d (diff) | |
| download | hdf5-4ccb865c70f977a4a97d75df3d6e792c8cbdfdd8.zip hdf5-4ccb865c70f977a4a97d75df3d6e792c8cbdfdd8.tar.gz hdf5-4ccb865c70f977a4a97d75df3d6e792c8cbdfdd8.tar.bz2 | |
[svn-r25273] Description:
Bring in Chao/Neil/my changes to optimize hyperslab selection operations
further, along with 3 new public API routines: H5Scombine_hyperslab(),
H5Sselect_select() and H5Scombine_select(), along with many minor cleanups to
the code and fixing a few compiler warnings.
Tested on:
Mac OSX/64 10.9.3 w/gcc 4.9.x and parallel w/OpenMPI
(h5commttest forthcoming)
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 9328e57..88367d6 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -455,7 +455,7 @@ done: /*------------------------------------------------------------------------- * Function: H5D__get_space_status * - * Purpose: Returns the status of data space allocation. + * Purpose: Returns the status of dataspace allocation. * * Return: * Success: Non-negative @@ -2172,16 +2172,16 @@ H5D__set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id) if(H5D__check_filters(dset) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't apply filters") - /* Get the data space */ + /* Get the dataspace */ space = dset->shared->space; /* Check if we are shrinking or expanding any of the dimensions */ if((rank = H5S_get_simple_extent_dims(space, curr_dims, NULL)) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get dataset dimensions") - /* Modify the size of the data space */ + /* Modify the size of the dataspace */ if((changed = H5S_set_extent(space, size)) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to modify size of data space") + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to modify size of dataspace") /* Don't bother updating things, unless they've changed */ if(changed) { |