[svn-r26419] merged r26373 and r26380 from the trunk into the branch.

tested: h5committest

3 files changed, 21 insertions, 105 deletions

diff --git a/tools/h5dump/errfiles/tarray1_big.err b/tools/h5dump/errfiles/tarray1_big.err
index edfe0df..d5cd435 100644
--- a/tools/h5dump/errfiles/tarray1_big.err
+++ b/tools/h5dump/errfiles/tarray1_big.err
@@ -2,59 +2,23 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
   #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
     major: Failure in tools library
diff --git a/tools/h5dump/errfiles/tattrregR.err b/tools/h5dump/errfiles/tattrregR.err
index 4dca3ae..c5aa5ba 100644
--- a/tools/h5dump/errfiles/tattrregR.err
+++ b/tools/h5dump/errfiles/tattrregR.err
@@ -2,40 +2,16 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
   #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
     major: Failure in tools library
diff --git a/tools/h5dump/errfiles/tdataregR.err b/tools/h5dump/errfiles/tdataregR.err
index 4dca3ae..c5aa5ba 100644
--- a/tools/h5dump/errfiles/tdataregR.err
+++ b/tools/h5dump/errfiles/tdataregR.err
@@ -2,40 +2,16 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference(): 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
-    major: References
-    minor: Read failed
-  #002: (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
-    major: Heap
-    minor: Unable to protect metadata
-  #004: (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
-    major: Object cache
-    minor: Inappropriate type
+  #001: (file name) line (number) in H5R_dereference(): Undefined reference pointer
+    major: Invalid arguments to routine
+    minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
   #000: (file name) line (number) in h5tools_dump_simple_data(): H5Rdereference failed
     major: Failure in tools library