1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c: supress warnings.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-06-18 02:10:09 +00:00
parent afd7e4668f
commit 8192693ccf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Sat Jun 18 10:22:39 2011 Tanaka Akira <akr@fsij.org>
* internal.h: declare more internal functions. * internal.h: declare more internal functions.

6
io.c
View File

@ -7470,7 +7470,8 @@ do_io_advise(rb_io_t *fptr, VALUE advice, off_t offset, off_t len)
ias.offset = offset; ias.offset = offset;
ias.len = len; 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 /* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise
it returns the error code. */ it returns the error code. */
rb_syserr_fail(rv, RSTRING_PTR(fptr->pathv)); 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) #if defined(ERESTART)
case ERESTART: case ERESTART:
#endif #endif
if (rb_thread_interrupted(stp->th)) if (rb_thread_interrupted(stp->th)) {
if (has_gvl) if (has_gvl)
rb_thread_execute_interrupts(stp->th); rb_thread_execute_interrupts(stp->th);
else else
rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th); rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th);
}
return TRUE; return TRUE;
} }
return FALSE; return FALSE;