diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-07-28 16:29:04 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-07-28 16:29:04 (GMT) |
| commit | b201a78b33bd572f401c7d1693d06af0103e1a96 (patch) | |
| tree | f488dc298067c3088fea08f3db6b6d78734119c5 /src | |
| parent | 10e59f6ba4fdf105840e9d88204c16d505281978 (diff) | |
| parent | e4603ff8a171e82de6373ba6eddcf59d5eeab5aa (diff) | |
| download | hdf5-b201a78b33bd572f401c7d1693d06af0103e1a96.zip hdf5-b201a78b33bd572f401c7d1693d06af0103e1a96.tar.gz hdf5-b201a78b33bd572f401c7d1693d06af0103e1a96.tar.bz2 | |
Merge pull request #2714 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_set_extent_none to develop
* commit 'e4603ff8a171e82de6373ba6eddcf59d5eeab5aa':
Updated the Java tests to deal with H5Sset_extent_none changes
Fixed additional typos in tselect.c comments.
Fixes typo in tselect.c
Updates H5Sset_extent_none() to set H5S_NULL
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5S.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -437,6 +437,9 @@ H5S__extent_release(H5S_extent_t *extent) extent->max = H5FL_ARR_FREE(hsize_t, extent->max); } /* end if */ + extent->rank = 0; + extent->nelem = 0; + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5S__extent_release() */ @@ -1832,7 +1835,7 @@ done: RETURNS Non-negative on success/Negative on failure DESCRIPTION - This function resets the type of a dataspace back to "none" with no + This function resets the type of a dataspace to H5S_NULL with no extent information stored for the dataspace. --------------------------------------------------------------------------*/ herr_t @@ -1852,7 +1855,7 @@ H5Sset_extent_none(hid_t space_id) if(H5S__extent_release(&space->extent) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTDELETE, FAIL, "can't release previous dataspace") - space->extent.type = H5S_NO_CLASS; + space->extent.type = H5S_NULL; done: FUNC_LEAVE_API(ret_value) |