akr	2009-02-10 01:03:08 +0900 (Tue, 10 Feb 2009)

  New Revision: 22187

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

  Log:
    * ext/socket/mkconstants.rb: generate intern_family_noprefix.
    * ext/socket/option.c (sockopt_inspect): use intern_family_noprefix
      not to show AF_ prefix.
    
    * ext/socket/ancdata.c (ancillary_inspect): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
    trunk/ext/socket/mkconstants.rb
    trunk/ext/socket/option.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22186)
+++ ChangeLog	(revision 22187)
@@ -1,3 +1,12 @@
+Tue Feb 10 01:02:16 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/mkconstants.rb: generate intern_family_noprefix.
+
+	* ext/socket/option.c (sockopt_inspect): use intern_family_noprefix
+	  not to show AF_ prefix.
+
+	* ext/socket/ancdata.c (ancillary_inspect): ditto.
+
 Mon Feb  9 23:21:29 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/constants.c (level_arg): use unknown_level_to_int for
Index: ext/socket/option.c
===================================================================
--- ext/socket/option.c	(revision 22186)
+++ ext/socket/option.c	(revision 22187)
@@ -302,7 +302,7 @@
 
     ret = rb_sprintf("#<%s: ", rb_obj_classname(self));
 
-    family_id = intern_family(family);
+    family_id = intern_family_noprefix(family);
     if (family_id)
 	rb_str_cat2(ret, rb_id2name(family_id));
     else
Index: ext/socket/mkconstants.rb
===================================================================
--- ext/socket/mkconstants.rb	(revision 22186)
+++ ext/socket/mkconstants.rb	(revision 22187)
@@ -253,6 +253,7 @@
 def_name_to_int("scm_optname_to_int", /\ASCM_/, "SCM_")
 
 def_intern('intern_family',  /\AAF_/)
+def_intern('intern_family_noprefix',  /\AAF_/, "AF_")
 def_intern('intern_protocol_family',  /\APF_/)
 def_intern('intern_socktype',  /\ASOCK_/)
 def_intern('intern_ipproto',  /\AIPPROTO_/)
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 22186)
+++ ext/socket/ancdata.c	(revision 22187)
@@ -599,7 +599,7 @@
 
     ret = rb_sprintf("#<%s: ", rb_obj_classname(self));
 
-    family_id = intern_family(family);
+    family_id = intern_family_noprefix(family);
     if (family_id)
         rb_str_cat2(ret, rb_id2name(family_id));
     else

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