diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-04-21 13:49:15 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-04-21 13:49:15 (GMT) |
commit | 729ad25bdff45c98e7a71acd118ee1332f0cc8bc (patch) | |
tree | 7067dce82888e04c0f6f371ef50af2dff1195431 /tools/src/h5dump | |
parent | c9a21e932e179e8a12106d5c98f9357b12aa6e3f (diff) | |
parent | c6097935d5be4c3750b9bf9167783ad28158905b (diff) | |
download | hdf5-729ad25bdff45c98e7a71acd118ee1332f0cc8bc.zip hdf5-729ad25bdff45c98e7a71acd118ee1332f0cc8bc.tar.gz hdf5-729ad25bdff45c98e7a71acd118ee1332f0cc8bc.tar.bz2 |
Merge pull request #2530 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit 'c6097935d5be4c3750b9bf9167783ad28158905b':
Separated VFD and VOL parameters in tools.
Diffstat (limited to 'tools/src/h5dump')
-rw-r--r-- | tools/src/h5dump/h5dump.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 3de6454..d292b75 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -870,7 +870,7 @@ parse_command_line(int argc, const char *argv[]) } /* this will be plenty big enough to hold the info */ - if((hand = (struct handler_t *)HDcalloc((size_t)argc, sizeof(struct handler_t)))==NULL) { + if((hand = (struct handler_t *)HDcalloc((size_t)argc, sizeof(struct handler_t))) == NULL) { goto error; } @@ -1415,16 +1415,14 @@ main(int argc, const char *argv[]) h5trav_set_index(sort_by, sort_order); if (driver != NULL) { - 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 = driver; + vfd_info.info = NULL; + vfd_info.name = driver; if (!HDstrcmp(driver, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - fapl_info.info_string = (void *)&ros3_fa; + vfd_info.info = (void *)&ros3_fa; #else error_msg("Read-Only S3 VFD not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); @@ -1433,7 +1431,7 @@ main(int argc, const char *argv[]) } else if (!HDstrcmp(driver, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - fapl_info.info_string = (void *)&hdfs_fa; + vfd_info.info = (void *)&hdfs_fa; #else error_msg("The HDFS VFD is not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); @@ -1441,7 +1439,7 @@ main(int argc, const char *argv[]) #endif } - if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &fapl_info)) < 0) { + if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, NULL, &vfd_info)) < 0) { error_msg("unable to create FAPL for file access\n"); h5tools_setstatus(EXIT_FAILURE); goto done; |