From 5ad05f37a5823530648f2bd42b4ec510a6e9046b Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Feb 2009 05:55:56 +0000
Subject: * ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
   optional.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                  |  5 +++++
 ext/socket/socket.c        | 22 ++++++++++++++--------
 test/socket/test_socket.rb |  5 +++++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4420f0afb..52e2b8fe4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb  2 14:53:35 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
+	  optional.
+
 Mon Feb  2 14:22:56 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/constants.c (cmsg_type_arg): INET6 check.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 6ef0b3d4d8..db27a1154b 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -19,7 +19,7 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
 
 /*
  * call-seq:
- *   Socket.new(domain, socktype, protocol) => socket
+ *   Socket.new(domain, socktype [, protocol]) => socket
  *
  * Creates a new socket object.
  *
@@ -28,19 +28,25 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
  * _protocol_ should be a protocol defined in the domain.
- * 0 is default protocol for the domain.
+ * This is optional.
+ * If it is not given, 0 is used internally.
  *
- *   Socket.new(:INET, :STREAM, 0) # TCP socket
- *   Socket.new(:INET, :DGRAM, 0)  # UDP socket
- *   Socket.new(:UNIX, :STREAM, 0) # UNIX stream socket
- *   Socket.new(:UNIX, :DGRAM, 0)  # UNIX datagram socket
+ *   Socket.new(:INET, :STREAM) # TCP socket
+ *   Socket.new(:INET, :DGRAM)  # UDP socket
+ *   Socket.new(:UNIX, :STREAM) # UNIX stream socket
+ *   Socket.new(:UNIX, :DGRAM)  # UNIX datagram socket
  */
 static VALUE
-sock_initialize(VALUE sock, VALUE domain, VALUE type, VALUE protocol)
+sock_initialize(int argc, VALUE *argv, VALUE sock)
 {
+    VALUE domain, type, protocol;
     int fd;
     int d, t;
 
+    rb_scan_args(argc, argv, "21", &domain, &type, &protocol);
+    if (NIL_P(protocol))
+        protocol = INT2FIX(0);
+
     rb_secure(3);
     setup_domain_and_type(domain, &d, type, &t);
     fd = ruby_socket(d, t, NUM2INT(protocol));
@@ -1742,7 +1748,7 @@ Init_socket()
 
     Init_socket_init();
 
-    rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
+    rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
     rb_define_method(rb_cSocket, "connect_nonblock", sock_connect_nonblock, 1);
     rb_define_method(rb_cSocket, "bind", sock_bind, 1);
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index cd19fdebf9..a3ce2b7ba0 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -5,6 +5,11 @@ rescue LoadError
 end
 
 class TestSocket < Test::Unit::TestCase
+  def test_socket_new
+    s = Socket.new(:INET, :STREAM)
+    assert_kind_of(Socket, s)
+  end
+
   def test_unpack_sockaddr
     sockaddr_in = Socket.sockaddr_in(80, "")
     assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) }
-- 
cgit v1.2.3