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

* ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.

Browse Source 
* ext/socket/socket.c (ipaddr): follow argument change.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-01-02 05:12:14 +00:00
parent d4b3e8ae70
commit 90a65796e7
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Jan 2 14:11:07 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb (gen_int_to_name): add lenp argument.
* ext/socket/socket.c (ipaddr): follow argument change.
Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org> Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org>
* signal.c (rb_signal_buff_size): defined for check whether signal * signal.c (rb_signal_buff_size): defined for check whether signal

12
ext/socket/mkconstants.rb
View File

@ -103,14 +103,14 @@ def each_alias(pat)
yield names yield names
end end
ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name(int_var, pat)") ERB.new(<<'EOS', nil, '%').def_method(Object, "gen_int_to_name(int_var, lenp_var, pat)")
switch (<%=int_var%>) { switch (<%=int_var%>) {
% each_alias(pat) {|names| % each_alias(pat) {|names|
% names.each_with_index {|n, i| % names.each_with_index {|n, i|
% cond = ["defined(#{n})"] % cond = ["defined(#{n})"]
% (0...i).each {|j| cond << "(!defined(#{names[j]}) || #{n} != #{names[j]})" } % (0...i).each {|j| cond << "(!defined(#{names[j]}) || #{n} != #{names[j]})" }
#if <%=cond.join(" && ")%> #if <%=cond.join(" && ")%>
case <%=n%>: return <%=c_str n%>; case <%=n%>: if (<%=lenp_var%>) *<%=lenp_var%> = <%=n.bytesize%>; return <%=c_str n%>;
#endif #endif
% } % }
% } % }
@ -190,9 +190,9 @@ udp_optname_to_int(char *str, int len, int *valp)
} }
static char * static char *
family_to_str(int val) family_to_str(int val, int *lenp)
{ {
<%= gen_int_to_name("val", /\AAF_/) %> <%= gen_int_to_name("val", "lenp", /\AAF_/) %>
} }
EOS EOS
@ -214,6 +214,8 @@ SOCK_RDM
SOCK_SEQPACKET SOCK_SEQPACKET
SOCK_PACKET SOCK_PACKET
AF_UNSPEC
PF_UNSPEC
AF_INET AF_INET
PF_INET PF_INET
AF_INET6 AF_INET6
@ -226,8 +228,6 @@ AF_IPX
PF_IPX PF_IPX
AF_APPLETALK AF_APPLETALK
PF_APPLETALK PF_APPLETALK
AF_UNSPEC
PF_UNSPEC
AF_LOCAL AF_LOCAL
PF_LOCAL PF_LOCAL
AF_IMPLINK AF_IMPLINK

2
ext/socket/socket.c
View File

@ -1063,7 +1063,7 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup)
char hbuf[1024], pbuf[1024]; char hbuf[1024], pbuf[1024];
char *name; char *name;
name = family_to_str(sockaddr->sa_family); name = family_to_str(sockaddr->sa_family, NULL);
if (name) if (name)
family = rb_str_new2(name); family = rb_str_new2(name);
else { else {