Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop

1 files changed, 13 insertions, 9 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 7aa2419..cb9b92c 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1480,8 +1480,6 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             break;
     } /* end switch */
 
-done:
-
 CATCH
     H5TOOLS_ENDDEBUG("exit");
     return ret_value;
@@ -1806,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) {
+        int token_cmp_val;
 
-    if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr==oinfo2.addr)
-      ret_val = TRUE;
+        H5Otoken_cmp(loc_id1, &oinfo1.token, &oinfo2.token, &token_cmp_val);
+
+        if(!token_cmp_val)
+            ret_val = TRUE;
+    }
 
     return ret_val;
 }