[svn-r26396] Merge of r26349-26392 from the trunk.

Tested on: h5committest

4 files changed, 33 insertions, 109 deletions

diff --git a/tools/h5dump/errfiles/tarray1_big.err b/tools/h5dump/errfiles/tarray1_big.err
index 457afdd..7a0fd7b 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 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
-    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 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
-    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 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
-    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 7ab9afd..9449a6d 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 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
-    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 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
-    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 7ab9afd..9449a6d 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 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
-    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 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
-    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/lib/h5trav.c b/tools/lib/h5trav.c
index d0a4a76..90e6d3d 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -50,6 +50,10 @@ typedef struct {
     hid_t fid;                      /* File ID being traversed */
 } trav_print_udata_t;
 
+typedef struct trav_path_op_data_t {
+    const char *path;
+} trav_path_op_data_t;
+
 /* format for hsize_t */
 #ifdef H5TRAV_PRINT_SPACE
 #define HSIZE_T_FORMAT   "%" H5_PRINTF_LL_WIDTH "u"
@@ -899,11 +903,11 @@ trav_attr(hid_t
 #ifndef H5TRAV_PRINT_SPACE
 UNUSED
 #endif /* H5TRAV_PRINT_SPACE */
-obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *op_data)
+obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *_op_data)
 {
-    char               *buf;
+    trav_path_op_data_t *op_data = (trav_path_op_data_t *)_op_data;
+    const char          *buf = op_data->path;
 
-    buf = (char*)op_data;
     if((strlen(buf)==1) && (*buf=='/'))
         printf(" %-10s %s%s", "attribute", buf, attr_name);
     else
@@ -1009,10 +1013,14 @@ trav_print_visit_obj(const char *path, const H5O_info_t *oinfo,
 
     /* Check if we've already seen this object */
     if(NULL == already_visited) {
+        trav_path_op_data_t op_data;
+
+        op_data.path = path;
         /* Finish printing line about object */
         printf("\n");
         if(trav_verbosity > 0)
-            H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order, NULL, trav_attr, (void *)path, H5P_DEFAULT);
+            H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order, 
+                               NULL, trav_attr, &op_data, H5P_DEFAULT);
     }
     else
         /* Print the link's original name */