summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-26 09:36:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-26 09:36:35 +0000
commit87e4ad0a236217fb27c3a0a22a1c3b4937f29771 (patch)
treebbde5fbb582f4881a8cb77d12fbf3e790e14edd5 /thread.c
parentc7451eb7255a534182caa0f2c27beda0b140f741 (diff)
* io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:
suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/thread.c b/thread.c
index 2f1ff92e8f..f0f2dce870 100644
--- a/thread.c
+++ b/thread.c
@@ -1811,7 +1811,7 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
fd_set orig_read, orig_write, orig_except;
#ifndef linux
- double limit;
+ double limit = 0;
struct timeval wait_rest;
if (timeout) {
@@ -1862,11 +1862,11 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
errno = lerrno;
if (result < 0) {
- if (errno == EINTR
+ switch (errno) {
+ case EINTR:
#ifdef ERESTART
- || errno == ERESTART
+ case ERESTART:
#endif
- ) {
if (read) *read = orig_read;
if (write) *write = orig_write;
if (except) *except = orig_except;
@@ -1881,6 +1881,8 @@ do_select(int n, fd_set *read, fd_set *write, fd_set *except,
}
#endif
goto retry;
+ default:
+ break;
}
}
return result;
@@ -1985,8 +1987,8 @@ timer_thread_function(void)
/* check signal */
if (vm->buffered_signal_size && vm->main_thread->exec_signal == 0) {
vm->main_thread->exec_signal = rb_get_next_signal(vm);
- thread_debug("buffered_signal_size: %d, sig: %d\n",
- vm->buffered_signal_size, vm->main_thread->exec_signal);
+ thread_debug("buffered_signal_size: %ld, sig: %d\n",
+ (long)vm->buffered_signal_size, vm->main_thread->exec_signal);
rb_thread_interrupt(vm->main_thread);
}