summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-18 02:10:09 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-18 02:10:09 +0000
commit8192693ccfc161a57a09b2f1f2b2f275182b66ac (patch)
treef47108190556e4491d65db0eb48a8e29ff2658bd
parentafd7e4668f8195a98eb45fd82132d3d11eada77f (diff)
* io.c: supress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--io.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c24dbcac..bb0201ed34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 18 11:09:03 2011 Tanaka Akira <akr@fsij.org>
+
+ * io.c: supress warnings.
+
Sat Jun 18 10:22:39 2011 Tanaka Akira <akr@fsij.org>
* internal.h: declare more internal functions.
diff --git a/io.c b/io.c
index 9ce544c2ee..fae297990a 100644
--- a/io.c
+++ b/io.c
@@ -7470,7 +7470,8 @@ do_io_advise(rb_io_t *fptr, VALUE advice, off_t offset, off_t len)
ias.offset = offset;
ias.len = len;
- if (rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd))
+ rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd);
+ if (rv)
/* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise
it returns the error code. */
rb_syserr_fail(rv, RSTRING_PTR(fptr->pathv));
@@ -8539,11 +8540,12 @@ maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
#if defined(ERESTART)
case ERESTART:
#endif
- if (rb_thread_interrupted(stp->th))
+ if (rb_thread_interrupted(stp->th)) {
if (has_gvl)
rb_thread_execute_interrupts(stp->th);
else
rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th);
+ }
return TRUE;
}
return FALSE;