diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2020-08-06 23:31:41 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2020-08-06 23:31:41 (GMT) |
commit | 72363de1c0707687dde4326ac807d34a94d8cd04 (patch) | |
tree | 5dc81df1f2eebd3c4f59a5a080c7a1d7ea0ef422 /src/H5FDfamily.c | |
parent | 302dfeb11b4bb5d204683dbfd6824586b3863122 (diff) | |
parent | 47ad0ac7237b464e939fe54dd129a151944d9706 (diff) | |
download | hdf5-72363de1c0707687dde4326ac807d34a94d8cd04.zip hdf5-72363de1c0707687dde4326ac807d34a94d8cd04.tar.gz hdf5-72363de1c0707687dde4326ac807d34a94d8cd04.tar.bz2 |
Merge pull request #2730 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:file_locking_squash_2 to develop
* commit '47ad0ac7237b464e939fe54dd129a151944d9706':
Renames BEST-EFFORT to BEST_EFFORT for file locking env var
Updated the file locking Fortran property list wrappers and added a test.
Fixed missing parens in VFDs
Minor change to header comments in file locking C++ changes.
Squash merge of file locking fixes
Diffstat (limited to 'src/H5FDfamily.c')
-rw-r--r-- | src/H5FDfamily.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index d110ef7..154878e 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -1372,9 +1372,9 @@ H5FD_family_lock(H5FD_t *_file, hbool_t rw) for(v = 0; v < u; v++) { if(H5FD_unlock(file->memb[v]) < 0) /* Push error, but keep going */ - HDONE_ERROR(H5E_IO, H5E_CANTUNLOCK, FAIL, "unable to unlock member files") + HDONE_ERROR(H5E_IO, H5E_CANTUNLOCKFILE, FAIL, "unable to unlock member files") } /* end for */ - HGOTO_ERROR(H5E_IO, H5E_CANTLOCK, FAIL, "unable to lock member files") + HGOTO_ERROR(H5E_IO, H5E_CANTLOCKFILE, FAIL, "unable to lock member files") } /* end if */ done: @@ -1406,7 +1406,7 @@ H5FD_family_unlock(H5FD_t *_file) for(u = 0; u < file->nmembs; u++) if(file->memb[u]) if(H5FD_unlock(file->memb[u]) < 0) - HGOTO_ERROR(H5E_IO, H5E_CANTUNLOCK, FAIL, "unable to unlock member files") + HGOTO_ERROR(H5E_IO, H5E_CANTUNLOCKFILE, FAIL, "unable to unlock member files") done: FUNC_LEAVE_NOAPI(ret_value) |