summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-05 15:07:24 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-05 15:07:24 (GMT)
commitb56fb149c9a3c9dca11b406b7a2488f0c93ee187 (patch)
treed93f48889fc0cdec19b1bf4ff4d82afcf536e3d1
parent60bb3fd1108e2006a79b008d031a0f68a1e6b393 (diff)
parent9876155d3fdb073dd3769f18665c86d04cda4806 (diff)
downloadhdf5-b56fb149c9a3c9dca11b406b7a2488f0c93ee187.zip
hdf5-b56fb149c9a3c9dca11b406b7a2488f0c93ee187.tar.gz
hdf5-b56fb149c9a3c9dca11b406b7a2488f0c93ee187.tar.bz2
Merge pull request #394 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '9876155d3fdb073dd3769f18665c86d04cda4806': Updated the H5L.c error message after additional thought. Fix for HDFFV-10141. Updated an error message in H5L.c to be more helpful. Fixes HDFFV-10141.
-rw-r--r--src/H5L.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5L.c b/src/H5L.c
index b5c6240..ecdf8a2 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -2351,9 +2351,11 @@ H5L_delete_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
if(name == NULL)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
- /* Check for removing '.' */
+ /* Check for non-existent (NULL) link.
+ * Note that this can also occur when attempting to remove '.'
+ */
if(lnk == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "can't delete self")
+ HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "callback link pointer is NULL (specified link may be '.' or not exist)")
/* Remove the link from the group */
if(H5G_obj_remove(grp_loc->oloc, grp_loc->path->full_path_r, name, udata->dxpl_id) < 0)