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/H5FDmulti.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/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 72f4da5..f80cac5 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1856,7 +1856,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw) } /* end if */ if(nerrors) - H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error locking member files", -1) + H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTLOCKFILE, "error locking member files", -1) return 0; } /* H5FD_multi_lock() */ @@ -1893,7 +1893,7 @@ H5FD_multi_unlock(H5FD_t *_file) } END_MEMBERS; if(nerrors) - H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error unlocking member files", -1) + H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "error unlocking member files", -1) return 0; } /* H5FD_multi_unlock() */ |