[svn-r20365] BZ1725: H5DUMP displays type of reference for H5T_REFERENCE

bring r20349 from trunk

5 files changed, 15 insertions, 18 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 71b0804..def4f8c 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1241,16 +1241,12 @@ print_datatype(hid_t type,unsigned in_group)
             case H5T_REFERENCE:
                 printf("H5T_REFERENCE");
                 /* The BNF document states that the type of reference should be
-                 * displayed after "H5T_REFERENCE". Therefore add the missing
-                 * reference type if the region command line option is used. This
-                 * reference type will not be displayed if the region option is not used. */
-                if(display_region) {
-                    if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) {
-                        printf(" { H5T_STD_REF_DSETREG }");
-                    }
-                    else {
-                        printf(" { H5T_STD_REF_OBJECT }");
-                    }
+                 * displayed after "H5T_REFERENCE". */
+                if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) {
+                    printf(" { H5T_STD_REF_DSETREG }");
+                }
+                else {
+                    printf(" { H5T_STD_REF_OBJECT }");
                 }
                 break;
 
diff --git a/tools/testfiles/tattrreg.ddl b/tools/testfiles/tattrreg.ddl
index 5b64b18..989daf7 100644
--- a/tools/testfiles/tattrreg.ddl
+++ b/tools/testfiles/tattrreg.ddl
@@ -9,7 +9,7 @@ GROUP "/" {
       DATA {
       }
       ATTRIBUTE "Attribute1" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
          DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
          DATA {
          (0): DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9),
diff --git a/tools/testfiles/tdatareg.ddl b/tools/testfiles/tdatareg.ddl
index ea85fb9..d68401f 100644
--- a/tools/testfiles/tdatareg.ddl
+++ b/tools/testfiles/tdatareg.ddl
@@ -4,7 +4,7 @@ Expected output for 'h5dump tdatareg.h5'
 HDF5 "tdatareg.h5" {
 GROUP "/" {
    DATASET "Dataset1" {
-      DATATYPE  H5T_REFERENCE
+      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
       DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          DATASET /Dataset2 {(2,2)-(7,7)}, DATASET /Dataset2 {(6,9), (2,2),
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
index 5b9299b..7845675 100644
--- a/tools/testfiles/tnofilename.ddl
+++ b/tools/testfiles/tnofilename.ddl
@@ -35,6 +35,7 @@ usage: h5dump [OPTIONS] file
      -X S, --xml-ns=S      (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
                           E.g., to dump a file called `-f', use h5dump -- -f
+     -E, --enable-error-stack   Show all HDF5 error reporting
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/treference.ddl b/tools/testfiles/treference.ddl
index b34fa8d..b94802f 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/testfiles/treference.ddl
@@ -853,14 +853,14 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "reference" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): DATASET 976 /dset , DATASET 976 /dset 
          }
       }
       ATTRIBUTE "reference2D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -869,7 +869,7 @@ GROUP "/" {
          }
       }
       ATTRIBUTE "reference3D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -1817,14 +1817,14 @@ GROUP "/" {
          }
       }
       DATASET "reference" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): DATASET 976 /dset , DATASET 976 /dset 
          }
       }
       DATASET "reference2D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 3, 2 ) / ( 3, 2 ) }
          DATA {
          (0,0): DATASET 976 /dset , DATASET 976 /dset ,
@@ -1833,7 +1833,7 @@ GROUP "/" {
          }
       }
       DATASET "reference3D" {
-         DATATYPE  H5T_REFERENCE
+         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
          DATASPACE  SIMPLE { ( 4, 3, 2 ) / ( 4, 3, 2 ) }
          DATA {
          (0,0,0): DATASET 976 /dset , DATASET 976 /dset ,