[svn-r17941] Description:
Bring r17939 from trunk to 1.8 branch: Handle external links from symlinked files by adding another check to look for "child" files for links from the actual location of the "parent" file, instead of from the location of the symlink. Tested on: FreeBSD/32 6.3 (duty) (h5committested on trunk)
This commit is contained in:
@@ -409,7 +409,7 @@ done:
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
static herr_t
|
||||
H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
|
||||
H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name,
|
||||
const H5O_link_t UNUSED *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
|
||||
H5G_own_loc_t *own_loc/*out*/)
|
||||
{
|
||||
@@ -420,7 +420,7 @@ H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
|
||||
|
||||
/* Check if the name in this group resolved to a valid object */
|
||||
if(obj_loc == NULL)
|
||||
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object doesn't exist")
|
||||
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object '%s' doesn't exist", name)
|
||||
|
||||
/* Take ownership of the object's group location */
|
||||
/* (Group traversal callbacks are responsible for either taking ownership
|
||||
|
||||
Reference in New Issue
Block a user