diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2020-01-04 04:16:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2020-01-04 04:16:38 (GMT) |
| commit | 0225e6d59698c9a720177766794619c7ad273f4a (patch) | |
| tree | 7abfb57ae22f1b886bafb18294054386cdaba134 /src/H5Gnode.c | |
| parent | 041b14c876cc7466da7868ef563563c879951ad6 (diff) | |
| download | hdf5-0225e6d59698c9a720177766794619c7ad273f4a.zip hdf5-0225e6d59698c9a720177766794619c7ad273f4a.tar.gz hdf5-0225e6d59698c9a720177766794619c7ad273f4a.tar.bz2 | |
Small changes from the token_refactoring branch, to reduce the delta to develop
Diffstat (limited to 'src/H5Gnode.c')
| -rw-r--r-- | src/H5Gnode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index b79b7d2..d11d7a0 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1256,7 +1256,7 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, /* expand soft link */ if(H5G_CACHED_SLINK == src_ent->type && cpy_info->expand_soft_link) { - H5O_info_t oinfo; /* Information about object pointed to by soft link */ + haddr_t obj_addr; /* Address of object pointed to by soft link */ H5G_loc_t grp_loc; /* Group location holding soft link */ H5G_name_t grp_path; /* Path for group holding soft link */ char *link_name; /* Pointer to value of soft link */ @@ -1274,9 +1274,8 @@ H5G__node_copy(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, haddr_t addr, HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get link name") /* Check if the object pointed by the soft link exists in the source file */ - /* Only basic information is needed */ - if(H5G_loc_info(&grp_loc, link_name, &oinfo, H5O_INFO_BASIC) >= 0) { - tmp_src_ent.header = oinfo.addr; + if(H5G__loc_addr(&grp_loc, link_name, &obj_addr) >= 0) { + tmp_src_ent.header = obj_addr; src_ent = &tmp_src_ent; } /* end if */ else |