mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-18 17:40:55 +08:00
Merge pull request #2748 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:flock_windows_fix to develop
* commit '0ed65346033e7fbc71634d4911f9761e2ec145b2': Fixes flock Windows failure
This commit is contained in:
commit
c0ff30d239
@ -2255,15 +2255,15 @@ done:
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
herr_t
|
||||
h5_check_if_file_locking_enabled(hbool_t *are_enabled)
|
||||
h5_check_if_file_locking_enabled(hbool_t *is_enabled)
|
||||
{
|
||||
const char *filename = "locking_test_file";
|
||||
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
|
||||
int pmode = O_RDWR | O_CREAT | O_TRUNC;
|
||||
int fd = -1;
|
||||
|
||||
*are_enabled = TRUE;
|
||||
*is_enabled = TRUE;
|
||||
|
||||
if((fd = HDcreat(filename, mode)) < 0)
|
||||
if((fd = HDopen(filename, pmode, H5_POSIX_CREATE_MODE_RW)) < 0)
|
||||
goto error;
|
||||
|
||||
/* Test HDflock() to see if it works */
|
||||
@ -2277,7 +2277,7 @@ h5_check_if_file_locking_enabled(hbool_t *are_enabled)
|
||||
* error condition.
|
||||
*/
|
||||
errno = 0;
|
||||
*are_enabled = FALSE;
|
||||
*is_enabled = FALSE;
|
||||
}
|
||||
else
|
||||
goto error;
|
||||
@ -2293,7 +2293,7 @@ h5_check_if_file_locking_enabled(hbool_t *are_enabled)
|
||||
return SUCCEED;
|
||||
|
||||
error:
|
||||
*are_enabled = FALSE;
|
||||
*is_enabled = FALSE;
|
||||
if (fd > -1) {
|
||||
HDclose(fd);
|
||||
HDremove(filename);
|
||||
|
Loading…
x
Reference in New Issue
Block a user