1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/mkconstants.rb: rename family_to_str to intern_family.

Browse Source 
it returns ID now.

* ext/socket/socket.c (ipaddr): use intern_family.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-01-02 08:46:26 +00:00
parent b5aebd12c0
commit e4b7c0e8a3
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Jan 2 17:45:19 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb: rename family_to_str to intern_family.
it returns ID now.
* ext/socket/socket.c (ipaddr): use intern_family.
Fri Jan 2 17:20:31 2009 Tanaka Akira <akr@fsij.org> Fri Jan 2 17:20:31 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb: use ID in the values of * ext/socket/mkconstants.rb: use ID in the values of

20
ext/socket/mkconstants.rb
View File

@ -144,18 +144,18 @@ ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_hash(hash_var, pa
EOS EOS
ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)") ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name_func(func_name, hash_var)")
static VALUE static ID
<%=func_name%>(int val) <%=func_name%>(int val)
{ {
st_data_t name; st_data_t name;
if (st_lookup(<%=hash_var%>, (st_data_t)val, &name)) if (st_lookup(<%=hash_var%>, (st_data_t)val, &name))
return rb_id2str((ID)name); return (ID)name;
return Qnil; return 0;
} }
EOS EOS
STRINGIZER_DEFS = [] INTERN_DEFS = []
def def_stringizer(func_name, pat, prefix_optional=nil) def def_intern(func_name, pat, prefix_optional=nil)
prefix_pat = nil prefix_pat = nil
if prefix_optional if prefix_optional
if Regexp === prefix_optional if Regexp === prefix_optional
@ -168,14 +168,14 @@ def def_stringizer(func_name, pat, prefix_optional=nil)
decl = "static st_table *#{hash_var};" decl = "static st_table *#{hash_var};"
gen_hash = gen_int_to_name_hash(hash_var, pat, prefix_pat) gen_hash = gen_int_to_name_hash(hash_var, pat, prefix_pat)
func = gen_int_to_name_func(func_name, hash_var) func = gen_int_to_name_func(func_name, hash_var)
STRINGIZER_DEFS << [decl, gen_hash, func] INTERN_DEFS << [decl, gen_hash, func]
end end
def_stringizer('family_to_str', /\AAF_/) def_intern('intern_family', /\AAF_/)
result << ERB.new(<<'EOS', nil, '%').result(binding) result << ERB.new(<<'EOS', nil, '%').result(binding)
<%= STRINGIZER_DEFS.map {|decl, gen_hash, func| decl }.join("\n") %> <%= INTERN_DEFS.map {|decl, gen_hash, func| decl }.join("\n") %>
static void static void
init_constants(VALUE mConst) init_constants(VALUE mConst)
@ -195,7 +195,7 @@ init_constants(VALUE mConst)
#endif #endif
% end % end
% } % }
<%= STRINGIZER_DEFS.map {|decl, gen_hash, func| gen_hash }.join("\n") %> <%= INTERN_DEFS.map {|decl, gen_hash, func| gen_hash }.join("\n") %>
} }
static int static int
@ -246,7 +246,7 @@ udp_optname_to_int(char *str, int len, int *valp)
<%= gen_name_to_int("str", "len", "valp", /\AUDP_/, "UDP_") %> <%= gen_name_to_int("str", "len", "valp", /\AUDP_/, "UDP_") %>
} }
<%= STRINGIZER_DEFS.map {|decl, gen_hash, func| func }.join("\n") %> <%= INTERN_DEFS.map {|decl, gen_hash, func| func }.join("\n") %>
EOS EOS

7
ext/socket/socket.c
View File

@ -1061,10 +1061,11 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup)
VALUE ary; VALUE ary;
int error; int error;
char hbuf[1024], pbuf[1024]; char hbuf[1024], pbuf[1024];
ID id;
family = family_to_str(sockaddr->sa_family); id = intern_family(sockaddr->sa_family);
if (!NIL_P(family)) { if (id) {
family = rb_str_dup(family); family = rb_str_dup(rb_id2str(id));
} }
else { else {
sprintf(pbuf, "unknown:%d", sockaddr->sa_family); sprintf(pbuf, "unknown:%d", sockaddr->sa_family);