Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8)

* commit '285efe71114b51d3ed246df233482c78330f009d':
  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.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/H5L.c b/src/H5L.c
index 9c81f98..a4c1022 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -2292,9 +2292,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)