diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2008-12-03 18:09:09 +0000 |
| commit | 1f95b175707ec490f8bf08c6c28f2dee203818cb (patch) | |
| tree | f004cd5ba13d81b1182b65def6f3e20c6bda3798 /otherlibs/win32unix/lockf.c | |
| parent | c52e649d83e34967da0fd2a70faf5c91070c8a91 (diff) | |
merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/lockf.c')
| -rw-r--r-- | otherlibs/win32unix/lockf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/otherlibs/win32unix/lockf.c b/otherlibs/win32unix/lockf.c index 0494d635c..524f9516b 100644 --- a/otherlibs/win32unix/lockf.c +++ b/otherlibs/win32unix/lockf.c @@ -71,7 +71,7 @@ CAMLprim value unix_lockf(value fd, value cmd, value span) } h = Handle_val(fd); - + l_len = Long_val(span); /* No matter what, we need the current position in the file */ @@ -108,19 +108,19 @@ CAMLprim value unix_lockf(value fd, value cmd, value span) switch(Int_val(cmd)) { case 0: /* F_ULOCK - unlock */ if (! UnlockFileEx(h, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) + lock_len.LowPart, lock_len.HighPart, &overlap)) err = GetLastError(); break; case 1: /* F_LOCK - blocking write lock */ enter_blocking_section(); if (! LockFileEx(h, LOCKFILE_EXCLUSIVE_LOCK, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) + lock_len.LowPart, lock_len.HighPart, &overlap)) err = GetLastError(); leave_blocking_section(); break; case 2: /* F_TLOCK - non-blocking write lock */ if (! LockFileEx(h, LOCKFILE_FAIL_IMMEDIATELY | LOCKFILE_EXCLUSIVE_LOCK, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) + lock_len.LowPart, lock_len.HighPart, &overlap)) err = GetLastError(); break; case 3: /* F_TEST - check whether a write lock can be obtained */ @@ -130,7 +130,7 @@ CAMLprim value unix_lockf(value fd, value cmd, value span) * it is not clear the nature of the lock test performed * by ocaml (unix) currently. */ if (LockFileEx(h, LOCKFILE_FAIL_IMMEDIATELY | LOCKFILE_EXCLUSIVE_LOCK, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) { + lock_len.LowPart, lock_len.HighPart, &overlap)) { UnlockFileEx(h, 0, lock_len.LowPart, lock_len.HighPart, &overlap); } else { err = GetLastError(); @@ -139,13 +139,13 @@ CAMLprim value unix_lockf(value fd, value cmd, value span) case 4: /* F_RLOCK - blocking read lock */ enter_blocking_section(); if (! LockFileEx(h, 0, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) + lock_len.LowPart, lock_len.HighPart, &overlap)) err = GetLastError(); leave_blocking_section(); break; case 5: /* F_TRLOCK - non-blocking read lock */ if (! LockFileEx(h, LOCKFILE_FAIL_IMMEDIATELY, 0, - lock_len.LowPart, lock_len.HighPart, &overlap)) + lock_len.LowPart, lock_len.HighPart, &overlap)) err = GetLastError(); break; default: |