diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-30 16:05:26 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-30 16:05:26 (GMT) |
| commit | fde2d1fe4a452abe82404bee60e34151acdd186b (patch) | |
| tree | 253d779d21ff2d71178472f40ed20214891c6dce /src/H5Dint.c | |
| parent | 6fb94eb3a38ea5f6d7253b72f7038ac00f295962 (diff) | |
| parent | 1f8cb03e11a46f853881f45dac18eff2dd68401e (diff) | |
| download | hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.zip hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.gz hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1f8cb03e11a46f853881f45dac18eff2dd68401e':
Fix errors in Makefile.am files that cause "make check" to repeat test, even when there are no changes to source files. (Also add a ggenerated script to the list of files cleaned up on 'make distclean')
Further minor cleanups
Checkpoint normalization against incoming hyperslab / selection / dataspace improvements.
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 9bb2692..b9d9cce 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -378,7 +378,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 @@ -2694,13 +2694,13 @@ H5D__set_extent(H5D_t *dset, const hsize_t *size) for(u = 0; u < dset->shared->layout.storage.u.virt.list_nused; u++) { /* Patch extent */ if(H5S_set_extent(dset->shared->layout.storage.u.virt.list[u].source_dset.virtual_select, 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") dset->shared->layout.storage.u.virt.list[u].virtual_space_status = H5O_VIRTUAL_STATUS_CORRECT; /* Patch sub-source datasets */ for(v = 0; v < dset->shared->layout.storage.u.virt.list[u].sub_dset_nalloc; v++) if(H5S_set_extent(dset->shared->layout.storage.u.virt.list[u].sub_dset[v].virtual_select, 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") } /* end for */ /* Mark virtual datasets as not fully initialized so internal @@ -3425,9 +3425,9 @@ H5D__get_space(const H5D_t *dset) if(H5D__virtual_set_extent_unlim(dset) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update virtual dataset extent") - /* Read the data space message and return a data space object */ + /* Read the dataspace message and return a dataspace object */ if(NULL == (space = H5S_copy(dset->shared->space, FALSE, TRUE))) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get data space") + HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get dataspace") /* Create an atom */ if((ret_value = H5I_register(H5I_DATASPACE, space, TRUE)) < 0) |