Merge develop

6 files changed, 38 insertions, 101 deletions

diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index ff22495..a20b0b7 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -1,58 +1,31 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #002: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #002: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
index 8a1539c..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -1,39 +1,21 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
index 8a1539c..fa2014a 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -1,39 +1,21 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
+  #000: (file name) line (number) in H5Rget_obj_type3(): unable to get object token
     major: References
-    minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
+    minor: Can't get value
+  #001: (file name) line (number) in H5R__get_obj_token(): NULL token size
     major: References
-    minor: Can't open object
-  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
-    major: Invalid arguments to routine
-    minor: Bad value
+    minor: Unable to copy object
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
-  #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #000: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
-  #001: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
+  #001: (file name) line (number) in h5tools_dump_data(): H5Rget_obj_type3 H5R_OBJECT1 failed
     major: Failure in tools library
     minor: error in function
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index 2d70b35..39bbb0e 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -27,7 +27,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
+  #000: (file name) line (number) in H5Lget_info2(): unable to get link info
     major: Links
     minor: Can't get value
   #001: (file name) line (number) in H5VL_link_get(): link get failed
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index b0b908b..e2f24c1 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -27,7 +27,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
+  #000: (file name) line (number) in H5Lget_info2(): unable to get link info
     major: Links
     minor: Can't get value
   #001: (file name) line (number) in H5VL_link_get(): link get failed
diff --git a/tools/test/h5dump/errfiles/tqmarkfile.err b/tools/test/h5dump/errfiles/tqmarkfile.err
index 2c4f1ff..4c3b2ef 100644
--- a/tools/test/h5dump/errfiles/tqmarkfile.err
+++ b/tools/test/h5dump/errfiles/tqmarkfile.err
@@ -15,7 +15,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Lget_info(): unable to get link info
+  #000: (file name) line (number) in H5Lget_info2(): unable to get link info
     major: Symbol table
     minor: Object not found
   #001: (file name) line (number) in H5L_get_info(): name doesn't exist