diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-04-17 00:07:21 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-04-17 00:07:21 (GMT) |
| commit | 9ecca22dd1852145810280e8c54aa6b0ab26b604 (patch) | |
| tree | ab89bcc86bc815ba8ccd303cb355d064c446e817 /tools | |
| parent | 66842e3347a52e18aea227ba893a4d48ee0b80e7 (diff) | |
| download | hdf5-9ecca22dd1852145810280e8c54aa6b0ab26b604.zip hdf5-9ecca22dd1852145810280e8c54aa6b0ab26b604.tar.gz hdf5-9ecca22dd1852145810280e8c54aa6b0ab26b604.tar.bz2 | |
Fixed problems with S3 and HDFS VFDs.
* Updated info struct parameter to correct info_string
* Fixed Makefile.am where the S3 VFD was listed twice, causing
duplicated symbols errors.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libtest/h5tools_test_utils.c | 2 | ||||
| -rw-r--r-- | tools/src/h5dump/h5dump.c | 4 | ||||
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 4 | ||||
| -rw-r--r-- | tools/src/h5stat/h5stat.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 8956bb5..aecd3f5 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -1172,7 +1172,7 @@ test_set_configured_fapl(void) /* test */ fapl_info.type = VFD_BY_NAME; - fapl_info.info = C.conf_fa; + fapl_info.info_string = C.conf_fa; fapl_info.u.name = C.vfdname; result = h5tools_get_fapl(H5P_DEFAULT, &fapl_info); if (C.expected == 0) diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 457bdc0..3de6454 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1424,7 +1424,7 @@ main(int argc, const char *argv[]) if (!HDstrcmp(driver, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - fapl_info.info = (void *)&ros3_fa; + fapl_info.info_string = (void *)&ros3_fa; #else error_msg("Read-Only S3 VFD not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); @@ -1433,7 +1433,7 @@ main(int argc, const char *argv[]) } else if (!HDstrcmp(driver, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - fapl_info.info = (void *)&hdfs_fa; + fapl_info.info_string = (void *)&hdfs_fa; #else error_msg("The HDFS VFD is not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index eb86101..9fc91f1 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -3157,7 +3157,7 @@ main(int argc, const char *argv[]) if (!HDstrcmp(preferred_driver, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - fapl_info.info = (void *)&ros3_fa; + fapl_info.info_string = (void *)&ros3_fa; #else HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); leave(EXIT_FAILURE); @@ -3165,7 +3165,7 @@ main(int argc, const char *argv[]) } else if (!HDstrcmp(preferred_driver, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - fapl_info.info = (void *)&hdfs_fa; + fapl_info.info_string = (void *)&hdfs_fa; #else HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n"); leave(EXIT_FAILURE); diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index aae5416..bebe443 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -1822,7 +1822,7 @@ main(int argc, const char *argv[]) if (!HDstrcmp(drivername, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - fapl_info.info = (void *)&ros3_fa; + fapl_info.info_string = (void *)&ros3_fa; #else error_msg("Read-Only S3 VFD not enabled.\n"); goto done; @@ -1830,7 +1830,7 @@ main(int argc, const char *argv[]) } else if (!HDstrcmp(drivername, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - fapl_info.info = (void *)&hdfs_fa; + fapl_info.info_string = (void *)&hdfs_fa; #else error_msg("HDFS VFD not enabled.\n"); goto done; |