diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-01 03:23:50 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-01 03:23:50 (GMT) |
| commit | abd38c0b85b7436c455ed986361a0b3cc939d68a (patch) | |
| tree | 055022cc75f6626ae9406d659b162075e0b8361d /tools/src/h5ls | |
| parent | 18db5749dcf287e571e5e03125595ed69801c94c (diff) | |
| parent | 2c494482eb986ce051463e96d12a661c494a9335 (diff) | |
| download | hdf5-abd38c0b85b7436c455ed986361a0b3cc939d68a.zip hdf5-abd38c0b85b7436c455ed986361a0b3cc939d68a.tar.gz hdf5-abd38c0b85b7436c455ed986361a0b3cc939d68a.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2c494482eb986ce051463e96d12a661c494a9335':
Minor renaming in the tools code.
Diffstat (limited to 'tools/src/h5ls')
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index f46d70a..7ab5001 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -3141,16 +3141,16 @@ main(int argc, const char *argv[]) } if (preferred_driver) { - h5tools_get_fapl_info_t get_fapl_info; + h5tools_fapl_info_t fapl_info; /* Currently, only retrieval of VFDs is supported. */ - get_fapl_info.get_type = GET_VFD_BY_NAME; - get_fapl_info.info = NULL; - get_fapl_info.u.name = preferred_driver; + fapl_info.type = VFD_BY_NAME; + fapl_info.info = NULL; + fapl_info.u.name = preferred_driver; if (!HDstrcmp(preferred_driver, drivernames[ROS3_VFD_IDX])) { #ifdef H5_HAVE_ROS3_VFD - get_fapl_info.info = (void *)&ros3_fa; + fapl_info.info = (void *)&ros3_fa; #else HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); leave(EXIT_FAILURE); @@ -3158,14 +3158,14 @@ main(int argc, const char *argv[]) } else if (!HDstrcmp(preferred_driver, drivernames[HDFS_VFD_IDX])) { #ifdef H5_HAVE_LIBHDFS - get_fapl_info.info = (void *)&hdfs_fa; + fapl_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, &get_fapl_info)) < 0) { + if ((fapl_id = h5tools_get_fapl(H5P_DEFAULT, &fapl_info)) < 0) { HDfprintf(rawerrorstream, "Error: Unable to create FAPL for file access\n\n"); leave(EXIT_FAILURE); } |