diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-21 03:11:32 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-21 03:11:32 (GMT) |
| commit | 9be5b2842e307f5f5b67c7e42217ddff67b0bf61 (patch) | |
| tree | b23156eec2d83f8755971dd5cc746c28ea7c338a /tools/lib/h5tools.c | |
| parent | 628d267162895adef5a73e1cd5810030cc98335a (diff) | |
| parent | a95b5b1e056e171702ad41b69cb796da0cbb91eb (diff) | |
| download | hdf5-9be5b2842e307f5f5b67c7e42217ddff67b0bf61.zip hdf5-9be5b2842e307f5f5b67c7e42217ddff67b0bf61.tar.gz hdf5-9be5b2842e307f5f5b67c7e42217ddff67b0bf61.tar.bz2 | |
merge and fix
Diffstat (limited to 'tools/lib/h5tools.c')
| -rw-r--r-- | tools/lib/h5tools.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index c0868bf..cb9b92c 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1804,21 +1804,27 @@ hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2) { - H5O_info_t oinfo1, oinfo2; + H5O_info2_t oinfo1, oinfo2; hbool_t ret_val = FALSE; if ( name1 && HDstrcmp(name1, ".")) - H5Oget_info_by_name2(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); + H5Oget_info_by_name3(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); else - H5Oget_info2(loc_id1, &oinfo1, H5O_INFO_BASIC); + H5Oget_info3(loc_id1, &oinfo1, H5O_INFO_BASIC); if ( name2 && HDstrcmp(name2, ".")) - H5Oget_info_by_name2(loc_id2, name2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); + H5Oget_info_by_name3(loc_id2, name2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT); else - H5Oget_info2(loc_id2, &oinfo2, H5O_INFO_BASIC); + H5Oget_info3(loc_id2, &oinfo2, H5O_INFO_BASIC); - if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr==oinfo2.addr) - ret_val = TRUE; + if (oinfo1.fileno == oinfo2.fileno) { + int token_cmp_val; + + H5Otoken_cmp(loc_id1, &oinfo1.token, &oinfo2.token, &token_cmp_val); + + if(!token_cmp_val) + ret_val = TRUE; + } return ret_val; } |