diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-04-25 02:09:14 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-04-26 03:30:08 (GMT) |
| commit | 743a2adb2a5e9e95d4910e166755f4c69ce8624e (patch) | |
| tree | 1fb7d21258a1e868f91e6e2e14ce189098eab18f /src | |
| parent | 88fbce4183dc930da6ef8be7240c8969f5bf0c36 (diff) | |
| download | hdf5-743a2adb2a5e9e95d4910e166755f4c69ce8624e.zip hdf5-743a2adb2a5e9e95d4910e166755f4c69ce8624e.tar.gz hdf5-743a2adb2a5e9e95d4910e166755f4c69ce8624e.tar.bz2 | |
Merge pull request #2537 in HDFFV/hdf5 from ~DYOUNG/werror:fix-werrors to develop
* commit 'd16eb45d536bd13ca3cf1b0bdc76c58d95d13f17':
For compatibility with non-C99 Visual Studio versions, use "%" PRIuMAX instead of "%ju".
Fix `test/swmr_sparse_reader.c:118:77: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]` and `test/snapshots-hdf5/current/test/swmr_sparse_reader.c:129:100: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]`.
Fix `src/H5FDdirect.c:1346:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDdirect.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index ce5e081..34c4346 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -1335,16 +1335,13 @@ static herr_t H5FD_direct_lock(H5FD_t *_file, hbool_t rw) { H5FD_direct_t *file = (H5FD_direct_t*)_file; /* VFD file struct */ - int lock; /* The type of lock */ + const int lock = rw ? LOCK_EX : LOCK_SH; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT HDassert(file); - /* Determine the type of lock */ - int lock = rw ? LOCK_EX : LOCK_SH; - /* Place the lock with non-blocking */ if(HDflock(file->fd, lock | LOCK_NB) < 0) HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, FAIL, "unable to flock file") |