diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2020-11-30 12:50:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 12:50:39 (GMT) |
| commit | c256612e0950f3389249aa3a151d66ce01704d89 (patch) | |
| tree | 2b87801fba6d5d7beef06588a6631b764594183b /src/H5Sselect.c | |
| parent | a6e3d226043eb81aac3c315c6fd9262a036f9f1d (diff) | |
| download | hdf5-c256612e0950f3389249aa3a151d66ce01704d89.zip hdf5-c256612e0950f3389249aa3a151d66ce01704d89.tar.gz hdf5-c256612e0950f3389249aa3a151d66ce01704d89.tar.bz2 | |
Replace H5E_ATOM major error category with H5E_ID (#121)
* Renames H5I_ATOM to H5I_ID, among other related changes
* Java has been updated.
* Fortran is failing on my VM, even though I don't touch that.
* Adds a RELEASE.txt note for H5E_ATOM to H5E_ID changes
* Fixes typos in comments
Diffstat (limited to 'src/H5Sselect.c')
| -rw-r--r-- | src/H5Sselect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 231f35e..f1a6fc1 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -142,10 +142,10 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset) /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "not a dataspace") + HGOTO_ERROR(H5E_ID, H5E_BADID, FAIL, "not a dataspace") if (space->extent.rank == 0 || (H5S_GET_EXTENT_TYPE(space) == H5S_SCALAR || H5S_GET_EXTENT_TYPE(space) == H5S_NULL)) - HGOTO_ERROR(H5E_ATOM, H5E_UNSUPPORTED, FAIL, "can't set offset on scalar or null dataspace") + HGOTO_ERROR(H5E_ID, H5E_UNSUPPORTED, FAIL, "can't set offset on scalar or null dataspace") if (offset == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no offset specified") @@ -1671,7 +1671,7 @@ H5Sget_select_type(hid_t space_id) /* Check args */ if (NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE))) - HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, H5S_SEL_ERROR, "not a dataspace") + HGOTO_ERROR(H5E_ID, H5E_BADID, H5S_SEL_ERROR, "not a dataspace") /* Set return value */ ret_value = H5S_GET_SELECT_TYPE(space); @@ -2851,9 +2851,9 @@ H5Sselect_project_intersection(hid_t src_space_id, hid_t dst_space_id, hid_t src if (H5S_select_project_intersection(src_space, dst_space, src_intersect_space, &proj_space, FALSE) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCLIP, FAIL, "can't project dataspace intersection") - /* Atomize */ + /* Register */ if ((ret_value = H5I_register(H5I_DATASPACE, proj_space, TRUE)) < 0) - HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom") + HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, FAIL, "unable to register dataspace ID") done: if (ret_value < 0) @@ -3000,10 +3000,10 @@ H5Ssel_iter_create(hid_t space_id, size_t elmt_size, unsigned flags) if (H5S_select_iter_init(sel_iter, space, elmt_size, flags) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, H5I_INVALID_HID, "unable to initialize selection iterator") - /* Atomize */ + /* Register */ if ((ret_value = H5I_register(H5I_SPACE_SEL_ITER, sel_iter, TRUE)) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTREGISTER, H5I_INVALID_HID, - "unable to register dataspace selection iterator atom") + "unable to register dataspace selection iterator ID") done: FUNC_LEAVE_API(ret_value) |