[svn-r25476] - fix error output in several places.

- uncomment tests to check error output in Makefiles.
- fix bug in native implementation of H5Aiterate.

34 files changed, 406 insertions, 217 deletions

diff --git a/src/H5A.c b/src/H5A.c
index 5f9e57f..21e1d78 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -434,7 +434,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t aapl_id)
 
     /* Create the attribute through the VOL */
     if(NULL == (attr = H5VL_attr_open(obj, loc_params, vol_plugin, attr_name, aapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open attribute")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Get an atom for the attribute */
     if((ret_value = H5I_register2(H5I_ATTR, attr, vol_plugin, TRUE)) < 0)
@@ -510,7 +510,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
 
     /* Create the attribute through the VOL */
     if(NULL == (attr = H5VL_attr_open(obj, loc_params, vol_plugin, attr_name, aapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open attribute")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Get an atom for the attribute */
     if((ret_value = H5I_register2(H5I_ATTR, attr, vol_plugin, TRUE)) < 0)
@@ -595,7 +595,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
 
     /* Create the attribute through the VOL */
     if(NULL == (attr = H5VL_attr_open(obj, loc_params, vol_plugin, NULL, aapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open attribute")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Get an atom for the attribute */
     if((ret_value = H5I_register2(H5I_ATTR, attr, vol_plugin, TRUE)) < 0)
diff --git a/src/H5D.c b/src/H5D.c
index 9d224e2..fdcfb74 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -200,7 +200,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
 
     /* get the file object */
     if(NULL == (obj = (void *)H5VL_get_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
@@ -299,7 +299,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
 
     /* get the file object */
     if(NULL == (obj = (void *)H5VL_get_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
 
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
@@ -366,7 +366,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
 
     /* get the file object */
     if(NULL == (obj = (void *)H5VL_get_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
 
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
@@ -374,7 +374,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
 
     /* Create the dataset through the VOL */
     if(NULL == (dset = H5VL_dataset_open(obj, loc_params, vol_plugin, name, dapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
+	HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset")
 
     /* Get an atom for the dataset */
     if((ret_value = H5I_register2(H5I_DATASET, dset, vol_plugin, TRUE)) < 0)
diff --git a/src/H5Dio.c b/src/H5Dio.c
index cd4dae4..3afdb04 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -132,7 +132,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 
     /* check arguments */
     if(NULL == (dset = (void *)H5I_object_verify(dset_id, H5I_DATASET)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
     if(mem_space_id < 0 || file_space_id < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
@@ -223,7 +223,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 
     /* check arguments */
     if(NULL == (dset = (void *)H5I_object_verify(dset_id, H5I_DATASET)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataset identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Get the default dataset transfer property list if the user didn't provide one */
     if(H5P_DEFAULT == dxpl_id)
diff --git a/src/H5G.c b/src/H5G.c
index c6eecbf..a25b30b 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -483,7 +483,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
 
     /* Create the group through the VOL */
     if(NULL == (grp = H5VL_group_open(obj, loc_params, vol_plugin, name, gapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Get an atom for the group */
     if((ret_value = H5I_register2(H5I_GROUP, grp, vol_plugin, TRUE)) < 0)
diff --git a/src/H5L.c b/src/H5L.c
index 6fed2a4..f14119f 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -1050,7 +1050,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/,
     /* Get the link info through the VOL */
     if((ret_value = H5VL_link_get(obj, loc_params, vol_plugin, H5VL_LINK_GET_INFO, 
                                   H5AC_dxpl_id, H5_EVENT_STACK_NULL, linfo)) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -1116,7 +1116,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
     /* Get the link info through the VOL */
     if((ret_value = H5VL_link_get(obj, loc_params, vol_plugin, H5VL_LINK_GET_INFO, H5AC_dxpl_id, H5_EVENT_STACK_NULL, 
                                   linfo)) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get group info")
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link info")
 
 done:
     FUNC_LEAVE_API(ret_value)
diff --git a/src/H5O.c b/src/H5O.c
index 61e957d..a55a3e0 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -256,7 +256,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
     /* Open the object through the VOL */
     if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type, 
                                               H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     if ((ret_value = H5VL_object_register(opened_obj, opened_type, vol_plugin, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize dataset handle")
@@ -333,7 +333,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
 
     /* Open the object through the VOL */
     if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     if ((ret_value = H5VL_object_register(opened_obj, opened_type, vol_plugin, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize dataset handle")
@@ -404,7 +404,7 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
 
     /* Open the object through the VOL */
     if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     if ((ret_value = H5VL_object_register(opened_obj, opened_type, vol_plugin, TRUE)) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize dataset handle")
diff --git a/src/H5R.c b/src/H5R.c
index ef1a123..af446ef 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -605,7 +605,7 @@ H5Rdereference2(hid_t obj_id, hid_t oapl_id, H5R_type_t ref_type, const void *_r
 
     /* Open the object through the VOL */
     if(NULL == (opened_obj = H5VL_object_open(obj, loc_params, vol_plugin, &opened_type, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open object")
+	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to dereference object")
 
     /* Get an atom for the object */
     if ((ret_value = H5VL_object_register(opened_obj, opened_type, vol_plugin, TRUE)) < 0)
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index cab6223..40024ff 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -622,7 +622,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
     /* Create the datatype through the VOL */
     if(NULL == (dt = H5VL_datatype_open(obj, loc_params, vol_plugin, name, tapl_id, 
                                         H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to open datatype")
+	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
 
     /* Get an atom for the datatype */
     if ((ret_value = H5VL_create_datatype(dt, vol_plugin, TRUE)) < 0)
diff --git a/src/H5VLint.c b/src/H5VLint.c
index 65250a1..fe3b794 100644
--- a/src/H5VLint.c
+++ b/src/H5VLint.c
@@ -523,7 +523,7 @@ H5VL_attr_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, cons
 	HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, NULL, "vol plugin has no `attr open' method")
     /* call the corresponding VOL open callback */
     if(NULL == (ret_value = (vol_plugin->cls->attr_cls.open) (obj, loc_params, name, aapl_id, dxpl_id, H5_REQUEST_NULL)))
-        HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, NULL, "attribute open failed")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTOPENOBJ, NULL, "attribute open failed")
 
     vol_plugin->nrefs ++;
 done:
@@ -829,7 +829,7 @@ H5VL_datatype_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin,
 #endif
     /* call the corresponding VOL open callback */
     if(NULL == (ret_value = (vol_plugin->cls->datatype_cls.open)(obj, loc_params, name, tapl_id, dxpl_id, H5_REQUEST_NULL)))
-        HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, NULL, "open failed")
+        HGOTO_ERROR(H5E_VOL, H5E_CANTOPENOBJ, NULL, "open failed")
     vol_plugin->nrefs ++;
 
 done:
@@ -1015,7 +1015,7 @@ H5VL_dataset_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, c
     else {
         /* call the corresponding VOL open callback */
         if(NULL == (ret_value = (vol_plugin->cls->dataset_cls.open)(obj, loc_params, name, dapl_id, dxpl_id, H5_REQUEST_NULL)))
-            HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, NULL, "open failed")
+            HGOTO_ERROR(H5E_VOL, H5E_CANTOPENOBJ, NULL, "open failed")
         vol_plugin->nrefs ++;
 
     }
@@ -1599,7 +1599,7 @@ H5VL_group_open(void *obj, H5VL_loc_params_t loc_params, H5VL_t *vol_plugin, con
     else {
         /* call the corresponding VOL open callback */
         if(NULL == (ret_value = (vol_plugin->cls->group_cls.open)(obj, loc_params, name, gapl_id, dxpl_id, H5_REQUEST_NULL)))
-            HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, NULL, "open failed")
+            HGOTO_ERROR(H5E_VOL, H5E_CANTOPENOBJ, NULL, "open failed")
         vol_plugin->nrefs ++;
     }
 done:
@@ -1882,7 +1882,7 @@ H5VL_object_open(void *obj, H5VL_loc_params_t params, H5VL_t *vol_plugin, H5I_ty
 	HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, NULL, "vol plugin has no `object open' method")
     /* call the corresponding VOL open callback */
     if(NULL == (ret_value = (vol_plugin->cls->object_cls.open)(obj, params, opened_type, dxpl_id, H5_REQUEST_NULL)))
-	HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, NULL, "open failed")
+	HGOTO_ERROR(H5E_VOL, H5E_CANTOPENOBJ, NULL, "open failed")
     vol_plugin->nrefs++;
 
 done:
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index 4dcd2ba..c26f68b 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -660,6 +660,7 @@ static herr_t H5VL_native_attr_iterate(void *obj, H5VL_loc_params_t loc_params,
     hsize_t	last_attr;      /* Index of last attribute examined */
     void        *temp_obj = NULL;
     H5I_type_t  obj_type;
+    H5VL_t      *vol_plugin = NULL;  /* VOL plugin information */
     herr_t      ret_value;           /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -677,9 +678,15 @@ static herr_t H5VL_native_attr_iterate(void *obj, H5VL_loc_params_t loc_params,
 
     /* Iterate over the links */
     if(loc_params.type == H5VL_OBJECT_BY_SELF) {
+        /* Build the vol plugin struct */
+        if(NULL == (vol_plugin = (H5VL_t *)H5MM_calloc(sizeof(H5VL_t))))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+                vol_plugin->cls = &H5VL_native_g;
+        vol_plugin->nrefs = 1;
+
         /* Get an atom for the object */
-        if((obj_loc_id = H5VL_native_register(loc_params.obj_type, obj, TRUE)) < 0)
-            HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register object");
+        if((obj_loc_id = H5I_register2(loc_params.obj_type, obj, vol_plugin, TRUE)) < 0)
+            HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register object")
     }
     else if(loc_params.type == H5VL_OBJECT_BY_NAME) { 
         /* Set up opened group location to fill in */
@@ -724,7 +731,11 @@ done:
     /* Release resources */
     if(loc_params.type == H5VL_OBJECT_BY_SELF) {
         if(obj_loc_id >= 0 && NULL == H5I_remove(obj_loc_id))
-            HDONE_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object");
+            HDONE_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to free identifier");
+
+        vol_plugin->nrefs--;
+        if(0 == vol_plugin->nrefs)
+            H5MM_free(vol_plugin);
     }
     else if(loc_params.type == H5VL_OBJECT_BY_NAME) {
         if(obj_loc_id >= 0) {
diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1
index d471e13..35b6906 100644
--- a/test/testfiles/err_compat_1
+++ b/test/testfiles/err_compat_1
@@ -15,14 +15,14 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): not a location ID
     major: Invalid arguments to routine
     minor: Inappropriate type
-  #001: (file name) line (number) in H5G_loc(): invalid object ID
+  #001: (file name) line (number) in H5VL_get_object(): invalid identifier
     major: Invalid arguments to routine
-    minor: Bad value
+    minor: Inappropriate type
 
 ********* Print error stack in customized way *********
-    error #000: (file name) in H5G_loc(): line (number)
+    error #000: (file name) in H5VL_get_object(): line (number)
         major: Invalid arguments to routine
-        minor: Bad value
+        minor: Inappropriate type
     error #001: (file name) in H5Dcreate2(): line (number)
         major: Invalid arguments to routine
         minor: Inappropriate type
@@ -33,9 +33,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
         minor: Can't get value
 
 ********* Print error stack in customized way *********
-    error #000: (file name) in H5G_loc(): line (number)
+    error #000: (file name) in H5VL_get_object(): line (number)
         major: Invalid arguments to routine
-        minor: Bad value
+        minor: Inappropriate type
     error #001: (file name) in H5Dcreate2(): line (number)
         major: Invalid arguments to routine
         minor: Inappropriate type
@@ -43,9 +43,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): not a location ID
     major: Invalid arguments to routine
     minor: Inappropriate type
-  #001: (file name) line (number) in H5G_loc(): invalid object ID
+  #001: (file name) line (number) in H5VL_get_object(): invalid identifier
     major: Invalid arguments to routine
-    minor: Bad value
+    minor: Inappropriate type
 
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in main(): Error test failed
diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
index 0acd288..0efab28 100644
--- a/test/testfiles/error_test_1
+++ b/test/testfiles/error_test_1
@@ -41,19 +41,25 @@ 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 H5D__read(): can't read data
+  #001: (file name) line (number) in H5VL_dataset_read(): read failed
+    major: Virtual Object Layer
+    minor: Read failed
+  #002: (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
     major: Dataset
     minor: Read failed
-  #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
+  #004: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
+  #005: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Data filters
     minor: Filter operation failed
-  #004: (file name) line (number) in H5Z_pipeline(): required filter 'bogus' is not registered
+  #006: (file name) line (number) in H5Z_pipeline(): required filter 'bogus' is not registered
     major: Data filters
     minor: Read failed
-  #005: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '305' is not available
+  #007: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '305' is not available
     major: Plugin for dynamically loaded library
     minor: Unable to load metadata into cache
 
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index db9318a..69227f8 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -24,8 +24,8 @@ include $(top_srcdir)/config/commence.am
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 # Test programs and scripts
-TEST_PROG= #h5dumpgentest
-TEST_SCRIPT= #testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
+TEST_PROG= h5dumpgentest
+TEST_SCRIPT= testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
 
 check_PROGRAMS=$(TEST_PROG) binread
 check_SCRIPTS=$(TEST_SCRIPT)
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 16b2964..c1f00d6 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -103,7 +103,7 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
 	$(top_srcdir)/bin/test-driver
 check_PROGRAMS = $(am__EXEEXT_1) binread$(EXEEXT)
 bin_PROGRAMS = h5dump$(EXEEXT)
-TESTS = $(am__EXEEXT_1) $(am__EXEEXT_1)
+TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT)
 subdir = tools/h5dump
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -114,7 +114,7 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
 CONFIG_CLEAN_FILES = testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-am__EXEEXT_1 =
+am__EXEEXT_1 = h5dumpgentest$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 binread_SOURCES = binread.c
 binread_OBJECTS = binread.$(OBJEXT)
@@ -132,6 +132,10 @@ h5dump_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 h5dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(h5dump_LDFLAGS) $(LDFLAGS) -o $@
+h5dumpgentest_SOURCES = h5dumpgentest.c
+h5dumpgentest_OBJECTS = h5dumpgentest.$(OBJEXT)
+h5dumpgentest_LDADD = $(LDADD)
+h5dumpgentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -166,8 +170,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = binread.c $(h5dump_SOURCES)
-DIST_SOURCES = binread.c $(h5dump_SOURCES)
+SOURCES = binread.c $(h5dump_SOURCES) h5dumpgentest.c
+DIST_SOURCES = binread.c $(h5dump_SOURCES) h5dumpgentest.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -377,11 +381,8 @@ am__set_TESTS_bases = \
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.sh.log=.log)
-SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
-SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
+LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
@@ -392,6 +393,11 @@ am__set_b = \
     *) \
       b='$*';; \
   esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.sh.log=.log)
+SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver
+SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
@@ -677,8 +683,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin
 
 # Test programs and scripts
-TEST_PROG = #h5dumpgentest
-TEST_SCRIPT = #testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
+TEST_PROG = h5dumpgentest
+TEST_SCRIPT = testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 SCRIPT_DEPEND = h5dump$(EXEEXT)
 
@@ -819,6 +825,10 @@ h5dump$(EXEEXT): $(h5dump_OBJECTS) $(h5dump_DEPENDENCIES) $(EXTRA_h5dump_DEPENDE
 	@rm -f h5dump$(EXEEXT)
 	$(AM_V_CCLD)$(h5dump_LINK) $(h5dump_OBJECTS) $(h5dump_LDADD) $(LIBS)
 
+h5dumpgentest$(EXEEXT): $(h5dumpgentest_OBJECTS) $(h5dumpgentest_DEPENDENCIES) $(EXTRA_h5dumpgentest_DEPENDENCIES) 
+	@rm -f h5dumpgentest$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(h5dumpgentest_OBJECTS) $(h5dumpgentest_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -829,6 +839,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5dump.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5dump_ddl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5dump_xml.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5dumpgentest.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1039,6 +1050,13 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS)
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+h5dumpgentest.log: h5dumpgentest$(EXEEXT)
+	@p='h5dumpgentest$(EXEEXT)'; \
+	b='h5dumpgentest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .sh.log:
 	@p='$<'; \
 	$(am__set_b); \
diff --git a/tools/h5dump/errfiles/filter_fail.err b/tools/h5dump/errfiles/filter_fail.err
index db21044..061a0e3 100644
--- a/tools/h5dump/errfiles/filter_fail.err
+++ b/tools/h5dump/errfiles/filter_fail.err
@@ -2,19 +2,25 @@ 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 H5D__read(): can't read data
+  #001: (file name) line (number) in H5VL_dataset_read(): read failed
+    major: Virtual Object Layer
+    minor: Read failed
+  #002: (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
     major: Dataset
     minor: Read failed
-  #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
+  #004: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
+  #005: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Data filters
     minor: Filter operation failed
-  #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
+  #006: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
     major: Data filters
     minor: Read failed
-  #005: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '312' is not available
+  #007: (file name) line (number) in H5PL_load(): required dynamically loaded plugin filter '312' is not available
     major: Plugin for dynamically loaded library
     minor: Unable to load metadata into cache
 h5dump error: unable to print data
diff --git a/tools/h5dump/errfiles/tall-1.err b/tools/h5dump/errfiles/tall-1.err
index ba691d0..2313f50 100644
--- a/tools/h5dump/errfiles/tall-1.err
+++ b/tools/h5dump/errfiles/tall-1.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/tall-2A.err b/tools/h5dump/errfiles/tall-2A.err
index ba691d0..2313f50 100644
--- a/tools/h5dump/errfiles/tall-2A.err
+++ b/tools/h5dump/errfiles/tall-2A.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/tall-2A0.err b/tools/h5dump/errfiles/tall-2A0.err
index ba691d0..2313f50 100644
--- a/tools/h5dump/errfiles/tall-2A0.err
+++ b/tools/h5dump/errfiles/tall-2A0.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/tall-2B.err b/tools/h5dump/errfiles/tall-2B.err
index ba691d0..2313f50 100644
--- a/tools/h5dump/errfiles/tall-2B.err
+++ b/tools/h5dump/errfiles/tall-2B.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'somefile', temp_file_name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/tarray1_big.err b/tools/h5dump/errfiles/tarray1_big.err
index 457afdd..5b11b7b 100644
--- a/tools/h5dump/errfiles/tarray1_big.err
+++ b/tools/h5dump/errfiles/tarray1_big.err
@@ -2,57 +2,75 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/h5dump/errfiles/tattr-3.err b/tools/h5dump/errfiles/tattr-3.err
index ce8ddda..70ba935 100644
--- a/tools/h5dump/errfiles/tattr-3.err
+++ b/tools/h5dump/errfiles/tattr-3.err
@@ -1,8 +1,14 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Aopen(): unable to load attribute info from object header for attribute: 'attr'
+  #000: (file name) line (number) in H5Aopen(): unable to open attribute
+    major: Symbol table
+    minor: Can't open object
+  #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 load attribute info from object header for attribute: 'attr'
     major: Attribute
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5O_attr_open_by_name(): can't locate attribute: 'attr'
+  #003: (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/h5dump/errfiles/tattrregR.err b/tools/h5dump/errfiles/tattrregR.err
index 7ab9afd..65e38a1 100644
--- a/tools/h5dump/errfiles/tattrregR.err
+++ b/tools/h5dump/errfiles/tattrregR.err
@@ -2,38 +2,50 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/h5dump/errfiles/tcomp-3.err b/tools/h5dump/errfiles/tcomp-3.err
index ee47ee5..1e798d0 100644
--- a/tools/h5dump/errfiles/tcomp-3.err
+++ b/tools/h5dump/errfiles/tcomp-3.err
@@ -1,16 +1,22 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Topen2(): not found
+  #000: (file name) line (number) in H5Topen2(): unable to open datatype
+    major: Symbol table
+    minor: Can't open object
+  #001: (file name) line (number) in H5VL_datatype_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_datatype_open(): not found
     major: Datatype
     minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
+  #003: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object '#6632' doesn't exist
+  #006: (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/h5dump/errfiles/tdataregR.err b/tools/h5dump/errfiles/tdataregR.err
index 7ab9afd..65e38a1 100644
--- a/tools/h5dump/errfiles/tdataregR.err
+++ b/tools/h5dump/errfiles/tdataregR.err
@@ -2,38 +2,50 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: References
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5R_dereference(): Unable to read dataset region information
     major: References
     minor: Read failed
-  #002: (file name) line (number) in H5HG_read(): unable to protect global heap
+  #004: (file name) line (number) in H5HG_read(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #003: (file name) line (number) in H5HG_protect(): unable to protect global heap
+  #005: (file name) line (number) in H5HG_protect(): unable to protect global heap
     major: Heap
     minor: Unable to protect metadata
-  #004: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
+  #006: (file name) line (number) in H5AC_protect(): H5C_protect() failed.
     major: Object cache
     minor: Unable to protect metadata
-  #005: (file name) line (number) in H5C_protect(): incorrect cache entry type
+  #007: (file name) line (number) in H5C_protect(): incorrect cache entry type
     major: Object cache
     minor: Inappropriate type
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/h5dump/errfiles/tdset-2.err b/tools/h5dump/errfiles/tdset-2.err
index d9b92f3..143cc9d 100644
--- a/tools/h5dump/errfiles/tdset-2.err
+++ b/tools/h5dump/errfiles/tdset-2.err
@@ -1,33 +1,45 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
+  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #001: (file name) line (number) in H5VL_dataset_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): not found
     major: Dataset
     minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
+  #003: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'dset3' doesn't exist
+  #006: (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: Internal error (too specific to document in detail)
+    minor: Can't get value
+  #001: (file name) line (number) in H5VL_link_get(): 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
     major: Symbol table
     minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Symbol table
     minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
+  #006: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
     major: Symbol table
     minor: Object not found
 h5dump error: unable to get link info from "dset3"
diff --git a/tools/h5dump/errfiles/textlink.err b/tools/h5dump/errfiles/textlink.err
index 03c0550..f208ac6 100644
--- a/tools/h5dump/errfiles/textlink.err
+++ b/tools/h5dump/errfiles/textlink.err
@@ -2,49 +2,61 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'filename', temp_file_name = 'filename'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'filename', temp_file_name = 'filename'
     major: Links
     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: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'anotherfile', temp_file_name = 'anotherfile'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'anotherfile', temp_file_name = 'anotherfile'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/textlinkfar.err b/tools/h5dump/errfiles/textlinkfar.err
index 969e17c..6a563cf 100644
--- a/tools/h5dump/errfiles/textlinkfar.err
+++ b/tools/h5dump/errfiles/textlinkfar.err
@@ -2,49 +2,55 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open object
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #008: (file name) line (number) in H5O_open_name(): object not found
+  #010: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #009: (file name) line (number) in H5G_loc_find(): can't find object
+  #011: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #013: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
+  #015: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #016: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #015: (file name) line (number) in H5G_traverse_slink_cb(): component not found
+  #017: (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/h5dump/errfiles/textlinksrc.err b/tools/h5dump/errfiles/textlinksrc.err
index 969e17c..6a563cf 100644
--- a/tools/h5dump/errfiles/textlinksrc.err
+++ b/tools/h5dump/errfiles/textlinksrc.err
@@ -2,49 +2,55 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open object
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #008: (file name) line (number) in H5O_open_name(): object not found
+  #010: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #009: (file name) line (number) in H5G_loc_find(): can't find object
+  #011: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #013: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
+  #015: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #016: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #015: (file name) line (number) in H5G_traverse_slink_cb(): component not found
+  #017: (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/h5dump/errfiles/tgroup-2.err b/tools/h5dump/errfiles/tgroup-2.err
index 3659b5c..42c926f 100644
--- a/tools/h5dump/errfiles/tgroup-2.err
+++ b/tools/h5dump/errfiles/tgroup-2.err
@@ -2,19 +2,25 @@ 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 H5G__open_name(): group not found
+  #001: (file name) line (number) in H5VL_group_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5G__open_name(): group not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (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
-  #005: (file name) line (number) in H5G_loc_find_cb(): object 'y' doesn't exist
+  #007: (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/h5dump/errfiles/torderlinks1.err b/tools/h5dump/errfiles/torderlinks1.err
index 780c7e6..b39f6b8 100644
--- a/tools/h5dump/errfiles/torderlinks1.err
+++ b/tools/h5dump/errfiles/torderlinks1.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/torderlinks2.err b/tools/h5dump/errfiles/torderlinks2.err
index 780c7e6..b39f6b8 100644
--- a/tools/h5dump/errfiles/torderlinks2.err
+++ b/tools/h5dump/errfiles/torderlinks2.err
@@ -2,24 +2,30 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): 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
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (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
-  #004: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G_traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
+  #009: (file name) line (number) in H5L_extern_traverse(): unable to open external file, external link file name = 'fname', temp_file_name = 'fname'
     major: Links
     minor: Unable to open file
diff --git a/tools/h5dump/errfiles/tperror.err b/tools/h5dump/errfiles/tperror.err
index 19a7a73..84a2065 100644
--- a/tools/h5dump/errfiles/tperror.err
+++ b/tools/h5dump/errfiles/tperror.err
@@ -1,33 +1,45 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
+  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #001: (file name) line (number) in H5VL_dataset_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): not found
     major: Dataset
     minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
+  #003: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5G_loc_find_cb(): object 'bogus' doesn't exist
+  #006: (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: Internal error (too specific to document in detail)
+    minor: Can't get value
+  #001: (file name) line (number) in H5VL_link_get(): 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
     major: Symbol table
     minor: Object not found
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Symbol table
     minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
+  #006: (file name) line (number) in H5L_get_info_cb(): name doesn't exist
     major: Symbol table
     minor: Object not found
 h5dump error: unable to get link info from "bogus"
diff --git a/tools/h5dump/errfiles/tslink-D.err b/tools/h5dump/errfiles/tslink-D.err
index b98e324..59b0b31 100644
--- a/tools/h5dump/errfiles/tslink-D.err
+++ b/tools/h5dump/errfiles/tslink-D.err
@@ -1,25 +1,31 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): not found
+  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #001: (file name) line (number) in H5VL_dataset_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): not found
     major: Dataset
     minor: Object not found
-  #001: (file name) line (number) in H5G_loc_find(): can't find object
+  #003: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse_real(): special link traversal failed
+  #005: (file name) line (number) in H5G_traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #004: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #006: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
+  #007: (file name) line (number) in H5G_traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G_traverse_slink_cb(): component not found
+  #009: (file name) line (number) in H5G_traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index e38b93b..c2f3914 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -724,9 +724,7 @@ dump_named_datatype(hid_t tid, const char *name)
 
     /* print attributes */
     dump_indent += COL;
-
     attr_iteration(tid, attr_crt_order_flags);
-
     dump_indent -= COL;
 
 done: