From 004bb16ccc01608849c8d200aed990b6d6e2b98e Mon Sep 17 00:00:00 2001 From: normal Date: Sat, 2 Jan 2016 12:08:34 +0000 Subject: [PATCH] thread_sync.c: remove unnecessary casts for queue_sleep "Qfalse" and "(VALUE)0" are equivalent, and do not matter for an ignored argument, either. Additionally, there's no reason to cast the pointer to rb_thread_sleep_deadly when we already have a queue_sleep wrapper. * thread_sync.c (queue_do_pop): avoid cast with Qfalse (rb_szqueue_push): ditto, use queue_sleep wrapper git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_sync.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d116b8bd5..353f88fedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 2 21:07:55 2016 Eric Wong + + * thread_sync.c (queue_do_pop): avoid cast with Qfalse + (rb_szqueue_push): ditto, use queue_sleep wrapper + Sat Jan 2 16:16:14 2016 Masatoshi SEKI * lib/erb.rb: Allow ERB subclass to add token easily. diff --git a/thread_sync.c b/thread_sync.c index 9c73654b0f..e270b12538 100644 --- a/thread_sync.c +++ b/thread_sync.c @@ -786,7 +786,7 @@ queue_do_pop(VALUE self, int should_block) assert(queue_closed_p(self) == 0); rb_ary_push(args.waiting, args.th); - rb_ensure(queue_sleep, (VALUE)0, queue_delete_from_waiting, (VALUE)&args); + rb_ensure(queue_sleep, Qfalse, queue_delete_from_waiting, (VALUE)&args); } } @@ -1012,7 +1012,7 @@ rb_szqueue_push(int argc, VALUE *argv, VALUE self) } else { rb_ary_push(args.waiting, args.th); - rb_ensure((VALUE (*)())rb_thread_sleep_deadly, (VALUE)0, queue_delete_from_waiting, (VALUE)&args); + rb_ensure(queue_sleep, Qfalse, queue_delete_from_waiting, (VALUE)&args); } }