Sync with develop

17 files changed, 94 insertions, 16 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls
index 7409c16..0926c4c 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/testfiles/help-1.ls
@@ -46,6 +46,12 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
                    ...<kerberos cache path>,<username>,<buffer size>)
                    If absent or A == '(,,,,)', all default values are used.
                    Has no effect if vfd flag is not 'hdfs'.
+   --vol-value     Value (ID) of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-name      Name of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-info      VOL-specific info to pass to the VOL connector used for
+                   opening the HDF5 file specified
 
   file/OBJECT
     Each object consists of an HDF5 file name optionally followed by a
diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls
index 7409c16..0926c4c 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/testfiles/help-2.ls
@@ -46,6 +46,12 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
                    ...<kerberos cache path>,<username>,<buffer size>)
                    If absent or A == '(,,,,)', all default values are used.
                    Has no effect if vfd flag is not 'hdfs'.
+   --vol-value     Value (ID) of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-name      Name of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-info      VOL-specific info to pass to the VOL connector used for
+                   opening the HDF5 file specified
 
   file/OBJECT
     Each object consists of an HDF5 file name optionally followed by a
diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls
index 7409c16..0926c4c 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/testfiles/help-3.ls
@@ -46,6 +46,12 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
                    ...<kerberos cache path>,<username>,<buffer size>)
                    If absent or A == '(,,,,)', all default values are used.
                    Has no effect if vfd flag is not 'hdfs'.
+   --vol-value     Value (ID) of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-name      Name of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-info      VOL-specific info to pass to the VOL connector used for
+                   opening the HDF5 file specified
 
   file/OBJECT
     Each object consists of an HDF5 file name optionally followed by a
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index 95dfc3b..a122dee 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -22,6 +22,12 @@ usage: h5dump [OPTIONS] files
                                       <kerberos cache path>,<username>,
                                       <buffer size>)
                           Any absent attribute will use a default value.
+     --vol-value          Value (ID) of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-name           Name of the VOL connector to use for opening the
+                          HDF5 file specified
+     --vol-info           VOL-specific info to pass to the VOL connector used for
+                          opening the HDF5 file specified
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls
index 7409c16..0926c4c 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/testfiles/textlinksrc-nodangle-1.ls
@@ -46,6 +46,12 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
                    ...<kerberos cache path>,<username>,<buffer size>)
                    If absent or A == '(,,,,)', all default values are used.
                    Has no effect if vfd flag is not 'hdfs'.
+   --vol-value     Value (ID) of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-name      Name of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-info      VOL-specific info to pass to the VOL connector used for
+                   opening the HDF5 file specified
 
   file/OBJECT
     Each object consists of an HDF5 file name optionally followed by a
diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls
index 7409c16..0926c4c 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/testfiles/tgroup-1.ls
@@ -46,6 +46,12 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]
                    ...<kerberos cache path>,<username>,<buffer size>)
                    If absent or A == '(,,,,)', all default values are used.
                    Has no effect if vfd flag is not 'hdfs'.
+   --vol-value     Value (ID) of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-name      Name of the VOL connector to use for opening the
+                   HDF5 file specified
+   --vol-info      VOL-specific info to pass to the VOL connector used for
+                   opening the HDF5 file specified
 
   file/OBJECT
     Each object consists of an HDF5 file name optionally followed by a
diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/testfiles/tgrpnullspace.ddl
index 2b91527..7c1ef6c 100644
--- a/tools/testfiles/tgrpnullspace.ddl
+++ b/tools/testfiles/tgrpnullspace.ddl
@@ -13,7 +13,7 @@ GROUP "/" {
          STORAGE_LAYOUT {
             CONTIGUOUS
             SIZE 0
-            OFFSET 18446744073709551615
+            OFFSET HADDR_UNDEF
          }
          FILTERS {
             NONE
diff --git a/tools/testfiles/tintsnodata.ddl b/tools/testfiles/tintsnodata.ddl
index c20f337..a1516af 100644
--- a/tools/testfiles/tintsnodata.ddl
+++ b/tools/testfiles/tintsnodata.ddl
@@ -6,7 +6,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -35,7 +35,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -64,7 +64,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -101,7 +101,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -154,7 +154,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -183,7 +183,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -212,7 +212,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -249,7 +249,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
@@ -302,7 +302,7 @@ GROUP "/" {
       STORAGE_LAYOUT {
          CONTIGUOUS
          SIZE 0
-         OFFSET 18446744073709551615
+         OFFSET HADDR_UNDEF
       }
       FILTERS {
          NONE
diff --git a/tools/testfiles/trefer_attrR.ddl b/tools/testfiles/trefer_attrR.ddl
index e64c8e6..118e7bf 100644
--- a/tools/testfiles/trefer_attrR.ddl
+++ b/tools/testfiles/trefer_attrR.ddl
@@ -12,16 +12,16 @@ GROUP "/" {
             }
          }
          ATTRIBUTE "trefer_attr.h5/Group1/Dataset2/Attr1" {
-               NULL
+            NULL
          }
-         ATTRIBUTE "trefer_attr.h5/Group1/Attr2"  {
+         ATTRIBUTE "trefer_attr.h5/Group1/Attr2" {
             DATATYPE  H5T_STD_U32LE
             DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
             DATA {
             (0): 1, 4, 7, 10
             }
          }
-         ATTRIBUTE "trefer_attr.h5/Group1/Datatype1/Attr3"  {
+         ATTRIBUTE "trefer_attr.h5/Group1/Datatype1/Attr3" {
             DATATYPE  H5T_STD_U32LE
             DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
             DATA {
diff --git a/tools/testfiles/trefer_extR.ddl b/tools/testfiles/trefer_extR.ddl
index 3d4647d..a96e5fd 100644
--- a/tools/testfiles/trefer_extR.ddl
+++ b/tools/testfiles/trefer_extR.ddl
@@ -12,16 +12,16 @@ GROUP "/" {
             }
          }
          ATTRIBUTE "trefer_ext1.h5/Group1/Dataset2/Attr1" {
-               NULL
+            NULL
          }
-         ATTRIBUTE "trefer_ext1.h5/Group1/Attr2"  {
+         ATTRIBUTE "trefer_ext1.h5/Group1/Attr2" {
             DATATYPE  H5T_STD_U32LE
             DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
             DATA {
             (0): 1, 4, 7, 10
             }
          }
-         ATTRIBUTE "trefer_ext1.h5/Group1/Datatype1/Attr3"  {
+         ATTRIBUTE "trefer_ext1.h5/Group1/Datatype1/Attr3" {
             DATATYPE  H5T_STD_U32LE
             DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
             DATA {