summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Hodel <drbrain@segment7.net>2014-02-12 14:48:28 -0800
committerEric Hodel <drbrain@segment7.net>2014-02-12 14:48:28 -0800
commitf2f229e2ede318c6296b7080400459519b643135 (patch)
treee85d0e24d497ec5f2669d48a19e5649c7838a91a
parentb23da2d383effec160ddf22725a330885077f89b (diff)
downloadsystemu-f2f229e2ede318c6296b7080400459519b643135.tar.gz
Fix warnings for Ruby 2.1.0
-rw-r--r--lib/systemu.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/systemu.rb b/lib/systemu.rb
index 04c24d9..e6cbb8e 100644
--- a/lib/systemu.rb
+++ b/lib/systemu.rb
@@ -121,9 +121,9 @@ class SystemUniversal
SystemUniversal.quote(*args, &block)
end
- def new_thread cid, block
+ def new_thread child_pid, block
q = Queue.new
- Thread.new(cid) do |cid|
+ Thread.new(child_pid) do |cid|
current = Thread.current
current.abort_on_exception = true
q.push current
@@ -205,9 +205,9 @@ class SystemUniversal
end
def relay srcdst
- src, dst, ignored = srcdst.to_a.first
+ src, dst, _ = srcdst.to_a.first
if src.respond_to? 'read'
- while((buf = src.read(8192))); dst << buf; end
+ while((buffer = src.read(8192))); dst << buffer; end
else
if src.respond_to?(:each_line)
src.each_line{|buf| dst << buf}
@@ -256,11 +256,11 @@ class SystemUniversal
def getopts opts = {}
lambda do |*args|
- keys, default, ignored = args
+ keys, default, _ = args
catch(:opt) do
[keys].flatten.each do |key|
- [key, key.to_s, key.to_s.intern].each do |key|
- throw :opt, opts[key] if opts.has_key?(key)
+ [key, key.to_s, key.to_s.intern].each do |k|
+ throw :opt, opts[k] if opts.has_key?(k)
end
end
default