* ext/socket/mkconstants.rb: add valp argument for family_to_int and

  socktype_to_int.

* ext/socket/socket.c (setup_domain_and_type): use valp argument.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 6 deletions

diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 09f0f030c7..3b3492b5c2 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -75,14 +75,14 @@ def each_names_with_len(pat)
   }
 end
 
-ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int(str_var, len_var, pat)")
+ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_name_to_int(str_var, len_var, retp_var, pat)")
     switch (<%=len_var%>) {
 %    each_names_with_len(pat) {|names, len|
       case <%=len%>:
 %      names.each {|name|
 #ifdef <%=name%>
 %       size = name.bytesize
-        if (memcmp(<%=str_var%>, <%=c_str name%>, <%=size%>) == 0) return <%=name%>;
+        if (memcmp(<%=str_var%>, <%=c_str name%>, <%=size%>) == 0) { *<%=retp_var%> = <%=name%>; return 0; }
 #endif
 %      }
         return -1;
@@ -153,15 +153,15 @@ init_constants(VALUE mConst)
 }
 
 static int
-family_to_int(char *str, int len)
+family_to_int(char *str, int len, int *valp)
 {
-<%= gen_name_to_int("str", "len", /\A[AP]F_/) %>
+<%= gen_name_to_int("str", "len", "valp", /\A[AP]F_/) %>
 }
 
 static int
-socktype_to_int(char *str, int len)
+socktype_to_int(char *str, int len, int *valp)
 {
-<%= gen_name_to_int("str", "len", /\ASOCK_/) %>
+<%= gen_name_to_int("str", "len", "valp", /\ASOCK_/) %>
 }
 
 static char *