summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-08-10 16:03:35 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-08-10 16:03:35 (GMT)
commitc0ff30d23948dd8801f231ea178fd8051c5c08dd (patch)
tree5e4de40e9edea74681fe6ea3ab459b48514cf952
parent0d69520c70b2ec541af4196eef344bac89f6ebe2 (diff)
parent0ed65346033e7fbc71634d4911f9761e2ec145b2 (diff)
downloadhdf5-c0ff30d23948dd8801f231ea178fd8051c5c08dd.zip
hdf5-c0ff30d23948dd8801f231ea178fd8051c5c08dd.tar.gz
hdf5-c0ff30d23948dd8801f231ea178fd8051c5c08dd.tar.bz2
Merge pull request #2748 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:flock_windows_fix to develop
* commit '0ed65346033e7fbc71634d4911f9761e2ec145b2': Fixes flock Windows failure
-rw-r--r--test/h5test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/h5test.c b/test/h5test.c
index 255932a..497a5f2 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -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);