diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-08-06 03:17:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-06 03:17:16 (GMT) |
| commit | 597ce3cdbf233fd1810e34e8452049d3285ab170 (patch) | |
| tree | a1e403af94592489ea804be0b280721efd45e704 /tools | |
| parent | b22984600a04120088f59bb5876c9d5258fd64b7 (diff) | |
| download | hdf5-597ce3cdbf233fd1810e34e8452049d3285ab170.zip hdf5-597ce3cdbf233fd1810e34e8452049d3285ab170.tar.gz hdf5-597ce3cdbf233fd1810e34e8452049d3285ab170.tar.bz2 | |
Fix issues in tools code after Subfiling VFD updates (#1973)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/h5tools.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index e0de100..ca21ccd 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -873,6 +873,12 @@ h5tools_get_vfd_name(hid_t fapl_id, char *drivername, size_t drivername_size) else if (driver_id == H5FD_HDFS) driver_name = drivernames[HDFS_VFD_IDX]; #endif +#ifdef H5_HAVE_SUBFILING_VFD + else if (driver_id == H5FD_SUBFILING) + driver_name = drivernames[SUBFILING_VFD_IDX]; +#endif + else if (driver_id == H5FD_ONION) + driver_name = drivernames[ONION_VFD_IDX]; else driver_name = "unknown"; @@ -1016,8 +1022,13 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec continue; /* Can we open the file with this combo? */ - if ((fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size)) >= - 0) { + H5E_BEGIN_TRY + { + fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size); + } + H5E_END_TRY; + + if (fid >= 0) { used_fapl_id = tmp_fapl_id; H5TOOLS_GOTO_DONE(fid); } |