diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-05-06 18:06:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-06 18:06:07 (GMT) |
| commit | 13985a7f529a3628fe215478f9d77f0d5b9b0fd1 (patch) | |
| tree | d82bdd79c45f99b5237977e3371af5a689014c14 /tools/src | |
| parent | cdf837d0a16acd657e53057d19b4b21763eeca45 (diff) | |
| download | hdf5-13985a7f529a3628fe215478f9d77f0d5b9b0fd1.zip hdf5-13985a7f529a3628fe215478f9d77f0d5b9b0fd1.tar.gz hdf5-13985a7f529a3628fe215478f9d77f0d5b9b0fd1.tar.bz2 | |
Fixes for S3 and HDFS VFDs with tools (#1740)
Diffstat (limited to 'tools/src')
| -rw-r--r-- | tools/src/h5dump/h5dump.c | 8 | ||||
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 4 | ||||
| -rw-r--r-- | tools/src/h5stat/h5stat.c | 9 |
3 files changed, 19 insertions, 2 deletions
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index d82ea94..22b869c 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -25,8 +25,8 @@ static const char *xml_dtd_uri_g = NULL; static hbool_t use_custom_vol_g = FALSE; static hbool_t use_custom_vfd_g = FALSE; -static h5tools_vol_info_t vol_info_g; -static h5tools_vfd_info_t vfd_info_g; +static h5tools_vol_info_t vol_info_g = {0}; +static h5tools_vfd_info_t vfd_info_g = {0}; #ifdef H5_HAVE_ROS3_VFD /* Default "anonymous" S3 configuration */ @@ -1238,6 +1238,8 @@ end_collect: h5tools_setstatus(EXIT_FAILURE); goto done; } + + vfd_info_g.info = &ros3_fa_g; #else error_msg("Read-Only S3 VFD not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); @@ -1255,6 +1257,8 @@ end_collect: h5tools_setstatus(EXIT_FAILURE); goto done; } + + vfd_info_g.info = &hdfs_fa_g; #else error_msg("HDFS VFD not enabled.\n"); h5tools_setstatus(EXIT_FAILURE); diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 228893a..b7ee380 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2854,6 +2854,8 @@ main(int argc, char *argv[]) usage(); leave(EXIT_FAILURE); } + + vfd_info.info = &ros3_fa; #else HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); usage(); @@ -2875,6 +2877,8 @@ main(int argc, char *argv[]) usage(); leave(EXIT_FAILURE); } + + vfd_info.info = &hdfs_fa; #else HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n"); usage(); diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index e42af10..d5b9a1a 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -1711,6 +1711,15 @@ main(int argc, char *argv[]) vfd_info.info = NULL; vfd_info.u.name = drivername; +#ifdef H5_HAVE_ROS3_VFD + if (!HDstrcmp(drivername, drivernames[ROS3_VFD_IDX])) + vfd_info.info = &ros3_fa; +#endif +#ifdef H5_HAVE_LIBHDFS + if (!HDstrcmp(drivername, drivernames[HDFS_VFD_IDX])) + vfd_info.info = &hdfs_fa; +#endif + if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, NULL, &vfd_info)) < 0) { error_msg("Unable to create FAPL for file access\n"); goto done; |