akr	2009-02-19 21:13:38 +0900 (Thu, 19 Feb 2009)

  New Revision: 22452

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

  Log:
    * ext/socket/ancdata.c (ancillary_unix_rights): method renamed.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
    trunk/test/socket/test_unix.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22451)
+++ ChangeLog	(revision 22452)
@@ -1,3 +1,7 @@
+Thu Feb 19 21:13:03 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ancdata.c (ancillary_unix_rights): method renamed.
+
 Thu Feb 19 15:47:11 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* template/fake.rb.in: extracted from Makefile.in.
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 22451)
+++ ext/socket/ancdata.c	(revision 22452)
@@ -176,25 +176,25 @@
 
 /*
  * call-seq:
- *   ancillarydata.rights => array-of-IOs
+ *   ancillarydata.unix_rights => array-of-IOs
  *
- * returns the array of IOs which is sent by SCM_RIGHTS control message.
+ * returns the array of IOs which is sent by SCM_RIGHTS control message in UNIX domain socket.
  *
  * The class of an IO in the array is IO or Socket. 
  *
  *   s1, s2 = UNIXSocket.pair
- *   p s1                                       #=> #<UNIXSocket:fd 3>
+ *   p s1                                         #=> #<UNIXSocket:fd 3>
  *   s1.sendmsg "standard IOs", 0, nil, [:SOCKET, :RIGHTS, [0,s1.fileno].pack("ii")]
  *   _, _, _, ctl = s2.recvmsg
- *   p ctl.rights                               #=> [#<IO:fd 6>, #<Socket:fd 7>]
- *   p File.identical?(STDIN, ctl.rights[0])    #=> true
- *   p File.identical?(s1, ctl.rights[1])       #=> true
+ *   p ctl.unix_rights                            #=> [#<IO:fd 6>, #<Socket:fd 7>]
+ *   p File.identical?(STDIN, ctl.unix_rights[0]) #=> true
+ *   p File.identical?(s1, ctl.unix_rights[1])    #=> true
  *
  */
 static VALUE
-ancillary_rights(VALUE self)
+ancillary_unix_rights(VALUE self)
 {
-    VALUE v = rb_attr_get(self, rb_intern("rights"));
+    VALUE v = rb_attr_get(self, rb_intern("unix_rights"));
     return v;
 }
 
@@ -1146,7 +1146,7 @@
 
 #if defined(HAVE_ST_MSG_CONTROL)
 static void
-make_io_for_rights(VALUE ctl, struct cmsghdr *cmh)
+make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh)
 {
     if (cmh->cmsg_level == SOL_SOCKET && cmh->cmsg_type == SCM_RIGHTS) {
         int *fdp = (int *)CMSG_DATA(cmh);
@@ -1161,10 +1161,10 @@
                 io = init_sock(rb_obj_alloc(rb_cSocket), fd);
             else
                 io = rb_io_fdopen(fd, O_RDWR, NULL);
-            ary = rb_attr_get(ctl, rb_intern("rights"));
+            ary = rb_attr_get(ctl, rb_intern("unix_rights"));
             if (NIL_P(ary)) {
                 ary = rb_ary_new();
-                rb_ivar_set(ctl, rb_intern("rights"), ary);
+                rb_ivar_set(ctl, rb_intern("unix_rights"), ary);
             }
             rb_ary_push(ary, io);
             fdp++;
@@ -1351,7 +1351,7 @@
             }
             clen = (char*)cmh + cmh->cmsg_len - (char*)CMSG_DATA(cmh);
             ctl = ancdata_new(family, cmh->cmsg_level, cmh->cmsg_type, rb_tainted_str_new((char*)CMSG_DATA(cmh), clen));
-            make_io_for_rights(ctl, cmh);
+            make_io_for_unix_rights(ctl, cmh);
             rb_ary_push(ret, ctl);
         }
     }
@@ -1451,7 +1451,7 @@
     rb_define_method(rb_cAncillaryData, "level", ancillary_level_m, 0);
     rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0);
     rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0);
-    rb_define_method(rb_cAncillaryData, "rights", ancillary_rights, 0);
+    rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0);
     rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2);
     rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4);
     rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0);
Index: test/socket/test_unix.rb
===================================================================
--- test/socket/test_unix.rb	(revision 22451)
+++ test/socket/test_unix.rb	(revision 22452)
@@ -53,7 +53,7 @@
         recv_io_ary = []
         ctls.each {|ctl|
           next if ctl.level != Socket::SOL_SOCKET || ctl.type != Socket::SCM_RIGHTS
-          recv_io_ary.concat ctl.rights
+          recv_io_ary.concat ctl.unix_rights
         }
         assert_equal(send_io_ary.length, recv_io_ary.length)
         send_io_ary.length.times {|i|
@@ -131,7 +131,7 @@
 	  assert_equal(Socket::SOL_SOCKET, ctl.level)
 	  assert_equal(Socket::SCM_RIGHTS, ctl.type)
 	  assert_instance_of(String, ctl.data)
-          ios = ctl.rights
+          ios = ctl.unix_rights
           assert_equal(1, ios.length)
 	  r2 = ios[0]
 	  begin

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