From c7e75cfe241a621f50c750720c47149a156e8e7f Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 20 Mar 2011 03:07:31 +0000
Subject: fix various warnings with "check-warnings" target

Run under 1.9.3dev
---
 lib/rainbows/epoll/client.rb               | 2 +-
 lib/rainbows/http_server.rb                | 2 +-
 lib/rainbows/never_block.rb                | 2 +-
 lib/rainbows/revactor.rb                   | 4 ++--
 lib/rainbows/thread_spawn.rb               | 6 +++---
 lib/rainbows/writer_thread_spawn/client.rb | 2 +-
 lib/rainbows/xepoll/client.rb              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/rainbows')

diff --git a/lib/rainbows/epoll/client.rb b/lib/rainbows/epoll/client.rb
index b7b0c9e..3ef51b3 100644
--- a/lib/rainbows/epoll/client.rb
+++ b/lib/rainbows/epoll/client.rb
@@ -226,7 +226,7 @@ module Rainbows::Epoll::Client
     else # nil => EOF
       return pipe.close # nil
     end while true
-    rescue => e
+    rescue
       pipe.close
       raise
   end
diff --git a/lib/rainbows/http_server.rb b/lib/rainbows/http_server.rb
index ab214c3..0fb60fe 100644
--- a/lib/rainbows/http_server.rb
+++ b/lib/rainbows/http_server.rb
@@ -9,7 +9,7 @@ class Rainbows::HttpServer < Unicorn::HttpServer
   def initialize(app, options)
     Rainbows.server = self
     @logger = Unicorn::Configurator::DEFAULTS[:logger]
-    rv = super(app, options)
+    super(app, options)
     defined?(@use) or use(:Base)
     @worker_connections ||= Rainbows::MODEL_WORKER_CONNECTIONS[@use]
   end
diff --git a/lib/rainbows/never_block.rb b/lib/rainbows/never_block.rb
index bcdaa3c..a11b81d 100644
--- a/lib/rainbows/never_block.rb
+++ b/lib/rainbows/never_block.rb
@@ -28,7 +28,7 @@ module Rainbows::NeverBlock
     DEFAULTS.each { |k,v| o[k] ||= v }
     Integer === o[:pool_size] && o[:pool_size] > 0 or
       raise ArgumentError, "pool_size must a be an Integer > 0"
-    mod = Rainbows.const_get(o[:backend])
+    Rainbows.const_get(o[:backend])
     require "never_block" # require EM first since we need a higher version
   end
 
diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb
index a335835..ce06e08 100644
--- a/lib/rainbows/revactor.rb
+++ b/lib/rainbows/revactor.rb
@@ -34,8 +34,8 @@ module Rainbows::Revactor
     limit = worker_connections
     actor_exit = Case[:exit, Actor, Object]
 
-    revactorize_listeners.each do |l, close, accept|
-      Actor.spawn(l, close, accept) do |l, close, accept|
+    revactorize_listeners.each do |l,close,accept|
+      Actor.spawn do
         Actor.current.trap_exit = true
         l.controller = l.instance_variable_set(:@receiver, Actor.current)
         begin
diff --git a/lib/rainbows/thread_spawn.rb b/lib/rainbows/thread_spawn.rb
index 281e223..30e143e 100644
--- a/lib/rainbows/thread_spawn.rb
+++ b/lib/rainbows/thread_spawn.rb
@@ -24,12 +24,12 @@ module Rainbows::ThreadSpawn
     limit = worker_connections
     nr = 0
     LISTENERS.each do |l|
-      klass.new(l) do |l|
+      klass.new do
         begin
           if lock.synchronize { nr >= limit }
             worker_yield
-          elsif c = l.kgio_accept
-            klass.new(c) do |c|
+          elsif client = l.kgio_accept
+            klass.new(client) do |c|
               begin
                 lock.synchronize { nr += 1 }
                 c.process_loop
diff --git a/lib/rainbows/writer_thread_spawn/client.rb b/lib/rainbows/writer_thread_spawn/client.rb
index 3106253..e5c8854 100644
--- a/lib/rainbows/writer_thread_spawn/client.rb
+++ b/lib/rainbows/writer_thread_spawn/client.rb
@@ -69,7 +69,7 @@ class Rainbows::WriterThreadSpawn::Client < Struct.new(:to_io, :q, :thr)
     end
 
     q = Queue.new
-    self.thr = Thread.new(to_io, q) do |io, q|
+    self.thr = Thread.new(to_io) do |io|
       while op = q.shift
         begin
           op, *rest = op
diff --git a/lib/rainbows/xepoll/client.rb b/lib/rainbows/xepoll/client.rb
index da0a0d1..6cae2f1 100644
--- a/lib/rainbows/xepoll/client.rb
+++ b/lib/rainbows/xepoll/client.rb
@@ -9,7 +9,7 @@ module Rainbows::XEpoll::Client
   THRESH = MAX - 1
   EP = Rainbows::Epoll::EP
   THREADS = Rainbows::HttpServer::LISTENERS.map do |sock|
-    Thread.new(sock) do |sock|
+    Thread.new do
       sleep
       begin
         if io = sock.kgio_accept
-- 
cgit v1.2.3-24-ge0c7