diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2004-06-22 21:08:10 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2004-06-22 21:08:10 (GMT) |
| commit | b87dc8724908278a90c7ac804e49b924207cb3af (patch) | |
| tree | ee2204c4f6f0a0d666aad45adc1bc283202157ce /src | |
| parent | 36f2adda39c9a1b72ac4522cc85fe28bc81c4641 (diff) | |
| download | hdf5-b87dc8724908278a90c7ac804e49b924207cb3af.zip hdf5-b87dc8724908278a90c7ac804e49b924207cb3af.tar.gz hdf5-b87dc8724908278a90c7ac804e49b924207cb3af.tar.bz2 | |
[svn-r8721] Purpose: Bug fix and test.
Description: Function H5Gget_objtype_by_idx failed to handle soft link
object. The library returned object type by calling H5G_get_type through
H5B_iterate. But H5G_get_type only deals with objects with valid header address
which soft link doesn't have.
Solution: In H5G_node_type, make soft link a special case by checking if
the object type is H5G_CACHED_SLINK. Also added a test of soft and hard links
to titerate.c
Platforms tested: h5committest and RH 8(fuss).
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Gnode.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 09d90da..71a1f1a 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -1630,7 +1630,16 @@ H5G_node_type(H5F_t *f, hid_t dxpl_id, void UNUSED *_lt_key, haddr_t addr, if(bt_udata->idx >= bt_udata->num_objs && bt_udata->idx < (bt_udata->num_objs+sn->nsyms)) { loc_idx = bt_udata->idx - bt_udata->num_objs; - bt_udata->type = H5G_get_type(&(sn->entry[loc_idx]), dxpl_id); + + /* Since H5G_get_type has to use header address in table entry and the + * header address for soft link is HADDR_UNDEF, make a special case for + * soft link here. + */ + if(sn->entry[loc_idx].type == H5G_CACHED_SLINK) + bt_udata->type = H5G_LINK; + else + bt_udata->type = H5G_get_type(&(sn->entry[loc_idx]), dxpl_id); + ret_value = H5B_ITER_STOP; } else { bt_udata->num_objs += sn->nsyms; |