akr	2011-08-10 23:04:23 +0900 (Wed, 10 Aug 2011)

  New Revision: 32908

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32908

  Log:
    * ext/socket/lib/socket.rb: fix argument check in the previous commit.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/lib/socket.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32907)
+++ ChangeLog	(revision 32908)
@@ -1,3 +1,7 @@
+Wed Aug 10 23:03:55 2011  Tanaka Akira  <akr@f...>
+
+	* ext/socket/lib/socket.rb: fix argument check in the previous commit.
+
 Wed Aug 10 22:12:28 2011  Tanaka Akira  <akr@f...>
 
 	* ext/socket/lib/socket.rb (Socket.tcp): add :connect_timeout option.
Index: ext/socket/lib/socket.rb
===================================================================
--- ext/socket/lib/socket.rb	(revision 32907)
+++ ext/socket/lib/socket.rb	(revision 32908)
@@ -102,7 +102,6 @@
   #
   def connect_from(*args, &block)
     opts = Hash === args.last ? args.pop : {}
-    raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if 1 < args.length
     local_addr_args = args
     connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
   end
@@ -151,7 +150,6 @@
   #
   def connect_to(*args, &block)
     opts = Hash === args.last ? args.pop : {}
-    raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if 1 < args.length
     remote_addr_args = args
     remote_addrinfo = family_addrinfo(*remote_addr_args)
     remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
@@ -299,7 +297,7 @@
   #
   def self.tcp(host, port, *rest) # :yield: socket
     opts = Hash === rest.last ? rest.pop : {}
-    raise ArgumentError, "wrong number of arguments (#{args.length} for 2)" if 2 < args.length
+    raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
     local_host, local_port = rest
     last_error = nil
     ret = nil

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/