summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-24 15:19:11 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-24 15:19:11 +0000
commit65d37c6cc5713fc51dff454e52d188bc691418e1 (patch)
treee71fbdf6467d906448426814d7b4f228d4573c48 /file.c
parentdc7549c0b0a54262b5e7939ee88a75557ef4c953 (diff)
* stable version 1.8.1 released.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/file.c b/file.c
index f4165b3..1750eef 100644
--- a/file.c
+++ b/file.c
@@ -2905,7 +2905,6 @@ rb_file_flock(obj, operation)
{
#ifndef __CHECKER__
OpenFile *fptr;
- int ret;
rb_secure(2);
GetOpenFile(obj, fptr);
@@ -2914,10 +2913,7 @@ rb_file_flock(obj, operation)
fflush(GetWriteFile(fptr));
}
retry:
- TRAP_BEG;
- ret = flock(fileno(fptr->f), NUM2INT(operation));
- TRAP_END;
- if (ret < 0) {
+ if (flock(fileno(fptr->f), NUM2INT(operation)) < 0) {
switch (errno) {
case EAGAIN:
case EACCES: