Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '55e87e5b86aacbb37c57614cd2e869541291caad': (51 commits)
  Correct Windows build.
  Refactor allocating & releasing pass through wrapper objects.
  Fix typo
  Remove duplicated comment.
  Add a couple of missing prototypes for static routines, along with updating a comment from VOL plugin -> connector.
  Switch H5VL_class_value_t from unsigned to int, and add "invalid" ID value.
  Correct "make check-vol" regression test target.
  Switch H5VL_class_value_t from enum to unsigned integer
  Add support for "make check-vol", along with a few minor cleanups, etc.
  Refactor infrastructure for setting FAPL information from environment variables during testing, including connecting native, pass-through, and dynamically loaded VOL connectors.   Also bring native and pass-through VOL connectors into alignment, removing the "H5VLnative_private.h" header.
  Remove example VOL connector, since it's been superceded by the pass-through VOL connector in the src subdirectory.
  Add pass-through VOL connector
  Update API tracing info for VOL functions and regenerate trace macros for VOL API calls.
  Added 'notify' callback for async requests; switched VOL class and info comparison to return comparison value as parameter, so they can return error values; "cancelled" -> "canceled"; switched order of 'wrap_object' and 'free_wrap_ctx' management callbacks.
  Add using FAPL from h5_fileaccess() to more tests.
  Remove unused test for unimplemented routine.
  Switch loc_params to VOL callbacks to pass struct by pointer instead of by value.
  Add info_to_str and str_to_info "management" callbacks for serializing and deserializing a connector's info object.
  Revert some of the changes to support the original property list value of metadata read attempts.
  Add VOL connector info to the flie access property list returned from H5Fget_access_plist().  Also, other misc. cleanups, etc.
  ...

20 files changed, 286 insertions, 205 deletions

diff --git a/tools/test/h5dump/errfiles/filter_fail.err b/tools/test/h5dump/errfiles/filter_fail.err
index 6c936b7..07b0aa0 100644
--- a/tools/test/h5dump/errfiles/filter_fail.err
+++ b/tools/test/h5dump/errfiles/filter_fail.err
@@ -2,25 +2,28 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dread(): can't read data
     major: Dataset
     minor: Read failed
-  #001: (file name) line (number) in H5VL_dataset_read(): read failed
+  #001: (file name) line (number) in H5VL_dataset_read(): dataset read failed
     major: Virtual Object Layer
     minor: Read failed
-  #002: (file name) line (number) in H5VL_native_dataset_read(): can't read data
+  #002: (file name) line (number) in H5VL__dataset_read(): dataset read failed
+    major: Virtual Object Layer
+    minor: Read failed
+  #003: (file name) line (number) in H5VL__native_dataset_read(): can't read data
     major: Dataset
     minor: Read failed
-  #003: (file name) line (number) in H5D__read(): can't read data
+  #004: (file name) line (number) in H5D__read(): can't read data
     major: Dataset
     minor: Read failed
-  #004: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
+  #005: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #005: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
+  #006: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Dataset
     minor: Filter operation failed
-  #006: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
+  #007: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
     major: Data filters
     minor: Read failed
-  #007: (file name) line (number) in H5PL_load(): filter plugins disabled
+  #008: (file name) line (number) in H5PL_load(): filter plugins disabled
     major: Plugin for dynamically loaded library
     minor: Unable to load metadata into cache
 h5dump error: unable to print data
diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index 64d5aca..2d2b289 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index 64d5aca..2d2b289 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index 64d5aca..2d2b289 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index 64d5aca..2d2b289 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index b2cc6b7..ff22495 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -2,39 +2,48 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to dereference 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
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tattr-3.err b/tools/test/h5dump/errfiles/tattr-3.err
index 3190c3d..8481acf 100644
--- a/tools/test/h5dump/errfiles/tattr-3.err
+++ b/tools/test/h5dump/errfiles/tattr-3.err
@@ -5,13 +5,16 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_attr_open(): attribute open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_attr_open(): unable to open attribute: 'attr'
+  #002: (file name) line (number) in H5VL__attr_open(): attribute open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_attr_open(): unable to open attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #003: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
+  #004: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #004: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
+  #005: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
     major: Attribute
     minor: Object not found
 h5dump error: unable to open attribute "attr"
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
index d89b053..8a1539c 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -2,26 +2,32 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to dereference 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
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tcomp-3.err b/tools/test/h5dump/errfiles/tcomp-3.err
index 3462761..fc59b0b 100644
--- a/tools/test/h5dump/errfiles/tcomp-3.err
+++ b/tools/test/h5dump/errfiles/tcomp-3.err
@@ -2,24 +2,27 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Topen2(): unable to open named datatype
     major: Datatype
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_datatype_open(): open failed
+  #001: (file name) line (number) in H5VL_datatype_open(): datatype open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_datatype_open(): unable to open named datatype
+  #002: (file name) line (number) in H5VL__datatype_open(): datatype open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_datatype_open(): unable to open named datatype
     major: Datatype
     minor: Can't open object
-  #003: (file name) line (number) in H5T__open_name(): not found
+  #004: (file name) line (number) in H5T__open_name(): not found
     major: Datatype
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #007: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
+  #008: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
index d89b053..8a1539c 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -2,26 +2,32 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to dereference 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
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
-  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #004: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index b2a60cd..2d70b35 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -5,44 +5,50 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #003: (file name) line (number) in H5D__open_name(): not found
+  #004: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #007: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
+  #008: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
     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
     major: Links
     minor: Can't get value
-  #001: (file name) line (number) in H5VL_link_get(): get failed
+  #001: (file name) line (number) in H5VL_link_get(): link get failed
     major: Virtual Object Layer
     minor: Can't get value
-  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+  #002: (file name) line (number) in H5VL__link_get(): link get failed
+    major: Virtual Object Layer
+    minor: Can't get value
+  #003: (file name) line (number) in H5VL__native_link_get(): unable to get link info
     major: Links
     minor: Object not found
-  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #004: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #007: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
     major: Links
     minor: Object not found
 h5dump error: unable to get link info from "dset3"
diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index f516638..aaf3144 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -2,67 +2,73 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
     major: File accessibility
     minor: Unable to open file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
index ba06406..8245291 100644
--- a/tools/test/h5dump/errfiles/textlinkfar.err
+++ b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -2,55 +2,58 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #010: (file name) line (number) in H5O_open_name(): object not found
+  #011: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #011: (file name) line (number) in H5G_loc_find(): can't find object
+  #012: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #013: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #017: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/textlinksrc.err b/tools/test/h5dump/errfiles/textlinksrc.err
index ba06406..8245291 100644
--- a/tools/test/h5dump/errfiles/textlinksrc.err
+++ b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -2,55 +2,58 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #010: (file name) line (number) in H5O_open_name(): object not found
+  #011: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #011: (file name) line (number) in H5G_loc_find(): can't find object
+  #012: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #013: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #016: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #017: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tgroup-2.err b/tools/test/h5dump/errfiles/tgroup-2.err
index af220b8..27557f3 100644
--- a/tools/test/h5dump/errfiles/tgroup-2.err
+++ b/tools/test/h5dump/errfiles/tgroup-2.err
@@ -2,25 +2,28 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Gopen2(): unable to open group
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_group_open(): open failed
+  #001: (file name) line (number) in H5VL_group_open(): group open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_group_open(): unable to open group
+  #002: (file name) line (number) in H5VL__group_open(): group open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_group_open(): unable to open group
     major: Symbol table
     minor: Can't open object
-  #003: (file name) line (number) in H5G__open_name(): group not found
+  #004: (file name) line (number) in H5G__open_name(): group not found
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #007: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
+  #008: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
     major: Symbol table
     minor: Object not found
 h5dump error: unable to open group "/y"
diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 1336de5..ce31ced 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 1336de5..ce31ced 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -2,33 +2,36 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): open failed
+  #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_native_object_open(): unable to open object by name
+  #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 open object by name
     major: Object header
     minor: Can't open object
-  #003: (file name) line (number) in H5O_open_name(): object not found
+  #004: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
-  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+  #011: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
     major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index 4df7265..b0b908b 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -5,44 +5,50 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #003: (file name) line (number) in H5D__open_name(): not found
+  #004: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #007: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
+  #008: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
     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
     major: Links
     minor: Can't get value
-  #001: (file name) line (number) in H5VL_link_get(): get failed
+  #001: (file name) line (number) in H5VL_link_get(): link get failed
     major: Virtual Object Layer
     minor: Can't get value
-  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+  #002: (file name) line (number) in H5VL__link_get(): link get failed
+    major: Virtual Object Layer
+    minor: Can't get value
+  #003: (file name) line (number) in H5VL__native_link_get(): unable to get link info
     major: Links
     minor: Object not found
-  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #004: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #007: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
     major: Links
     minor: Object not found
 h5dump error: unable to get link info from "bogus"
diff --git a/tools/test/h5dump/errfiles/tslink-D.err b/tools/test/h5dump/errfiles/tslink-D.err
index ded6719..e650a33 100644
--- a/tools/test/h5dump/errfiles/tslink-D.err
+++ b/tools/test/h5dump/errfiles/tslink-D.err
@@ -5,30 +5,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #003: (file name) line (number) in H5D__open_name(): not found
+  #004: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #004: (file name) line (number) in H5G_loc_find(): can't find object
+  #005: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #008: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #009: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #009: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #010: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #010: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #011: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 6009723..4e69148 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -2,40 +2,43 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5VL_dataset_create(): create failed
+  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
     major: Virtual Object Layer
-    minor: Unable to initialize object
-  #002: (file name) line (number) in H5VL_native_dataset_create(): unable to create dataset
+    minor: Unable to create file
+  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #003: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
     major: Dataset
     minor: Unable to initialize object
-  #004: (file name) line (number) in H5L_link_object(): unable to create new link to object
+  #005: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #005: (file name) line (number) in H5L__create_real(): can't insert link
+  #006: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #008: (file name) line (number) in H5L__link_cb(): unable to create object
+  #009: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #009: (file name) line (number) in H5O_obj_create(): unable to open object
+  #010: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #010: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #011: (file name) line (number) in H5D__create(): unable to construct layout information
+  #012: (file name) line (number) in H5D__create(): unable to construct layout information
     major: Dataset
     minor: Unable to initialize object
-  #012: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+  #013: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
     major: Dataset
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):