Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions

orginally intended to support the full SWMR feature.

11 files changed, 102 insertions, 138 deletions

diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index 9733453..f4c2d91 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index 9733453..f4c2d91 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index 9733453..f4c2d91 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index 9733453..f4c2d91 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index d00a92b..e61966f 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -21,19 +21,16 @@ 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 H5L__get_info(): unable to get link info for: 'dset3'
-    major: Links
-    minor: Can't get value
-  #002: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #002: (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
+  #003: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #004: (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 99e8530..4a5f545 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -2,61 +2,55 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
     major: File accessibilty
     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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
index a888ba9..1f9241a 100644
--- a/tools/test/h5dump/errfiles/textlinkfar.err
+++ b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -2,52 +2,49 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #007: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #009: (file name) line (number) in H5O_open_name(): object not found
+  #008: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #010: (file name) line (number) in H5G_loc_find(): can't find object
+  #009: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #012: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #011: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #014: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #013: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #015: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #014: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #016: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #015: (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 a888ba9..1f9241a 100644
--- a/tools/test/h5dump/errfiles/textlinksrc.err
+++ b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -2,52 +2,49 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #007: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #009: (file name) line (number) in H5O_open_name(): object not found
+  #008: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #010: (file name) line (number) in H5G_loc_find(): can't find object
+  #009: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #012: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #011: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #014: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #013: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #015: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #014: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #016: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #015: (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/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 22b4318..648906b 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 22b4318..648906b 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -2,30 +2,27 @@ 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 H5O__open_name(): unable to open object
-    major: Object header
-    minor: Can't open object
-  #002: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #003: (file name) line (number) in H5G_loc_find(): can't find object
+  #002: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #003: (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(): special link traversal failed
+  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #007: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #008: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #007: (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
-  #009: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
     major: File accessibilty
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index 55aeb4a..733b652 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -21,19 +21,16 @@ 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 H5L__get_info(): unable to get link info for: 'bogus'
-    major: Links
-    minor: Can't get value
-  #002: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #002: (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
+  #003: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #004: (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"