summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-04-05 18:24:07 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-04-05 18:24:07 (GMT)
commit1e0ecb4481e226239c1fd51bd214bd7e7490805d (patch)
tree27b24133d17c959be015e3606f3ef8eb0e8e4f93
parent857f515325ea0dce07a0059f735d97c39836e5de (diff)
parentb56fb149c9a3c9dca11b406b7a2488f0c93ee187 (diff)
downloadhdf5-1e0ecb4481e226239c1fd51bd214bd7e7490805d.zip
hdf5-1e0ecb4481e226239c1fd51bd214bd7e7490805d.tar.gz
hdf5-1e0ecb4481e226239c1fd51bd214bd7e7490805d.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'b56fb149c9a3c9dca11b406b7a2488f0c93ee187': 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)