summaryrefslogtreecommitdiffstats
path: root/tools/src/h5ls
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-04-21 00:38:45 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-04-21 00:38:45 (GMT)
commitc6097935d5be4c3750b9bf9167783ad28158905b (patch)
treea846bef8035c5886f1838bab47870708787cdfec /tools/src/h5ls
parent7ba692badf9a1bafb9d3b2f72efbbdf773b5932a (diff)
downloadhdf5-c6097935d5be4c3750b9bf9167783ad28158905b.zip
hdf5-c6097935d5be4c3750b9bf9167783ad28158905b.tar.gz
hdf5-c6097935d5be4c3750b9bf9167783ad28158905b.tar.bz2
Separated VFD and VOL parameters in tools.
Diffstat (limited to 'tools/src/h5ls')
-rw-r--r--tools/src/h5ls/h5ls.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 9fc91f1..3036ae9 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -3148,16 +3148,14 @@ main(int argc, const char *argv[])
}
if (preferred_driver) {
- h5tools_fapl_info_t fapl_info;
+ h5tools_vfd_info_t vfd_info;
- /* Currently, only retrieval of VFDs is supported. */
- fapl_info.type = VFD_BY_NAME;
- fapl_info.info_string = NULL;
- fapl_info.u.name = preferred_driver;
+ vfd_info.info = NULL;
+ vfd_info.name = preferred_driver;
if (!HDstrcmp(preferred_driver, drivernames[ROS3_VFD_IDX])) {
#ifdef H5_HAVE_ROS3_VFD
- fapl_info.info_string = (void *)&ros3_fa;
+ vfd_info.info = (void *)&ros3_fa;
#else
HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
leave(EXIT_FAILURE);
@@ -3165,14 +3163,14 @@ main(int argc, const char *argv[])
}
else if (!HDstrcmp(preferred_driver, drivernames[HDFS_VFD_IDX])) {
#ifdef H5_HAVE_LIBHDFS
- fapl_info.info_string = (void *)&hdfs_fa;
+ vfd_info.info = (void *)&hdfs_fa;
#else
HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n");
leave(EXIT_FAILURE);
#endif
}
- if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &fapl_info)) < 0) {
+ if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, NULL, &vfd_info)) < 0) {
HDfprintf(rawerrorstream, "Error: Unable to create FAPL for file access\n\n");
leave(EXIT_FAILURE);
}