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

* ext/socket/mkconstants.rb: rename level_to_int to iplevel_to_int.

Browse Source 
rename intern_level to intern_iplevel.

* ext/socket/constants.c: follow the renaming.

* ext/socket/option.c: ditto.

* ext/socket/ancdata.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-09 14:05:37 +00:00
parent f5da7031b9
commit 2dd3fa9f3e
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Mon Feb 9 23:04:27 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb: rename level_to_int to iplevel_to_int.
rename intern_level to intern_iplevel.
* ext/socket/constants.c: follow the renaming.
* ext/socket/option.c: ditto.
* ext/socket/ancdata.c: ditto.
Mon Feb 9 22:52:13 2009 Tanaka Akira <akr@fsij.org> Mon Feb 9 22:52:13 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/rubysocket.h (level_arg): add family argument. * ext/socket/rubysocket.h (level_arg): add family argument.

2
ext/socket/ancdata.c
View File

@ -605,7 +605,7 @@ ancillary_inspect(VALUE self)
else else
rb_str_catf(ret, "family:%d", family); rb_str_catf(ret, "family:%d", family);
level_id = intern_level(level); level_id = intern_iplevel(level);
if (level_id) if (level_id)
rb_str_catf(ret, " %s", rb_id2name(level_id)); rb_str_catf(ret, " %s", rb_id2name(level_id));
else else

2
ext/socket/constants.c
View File

@ -61,7 +61,7 @@ int
level_arg(int family, VALUE level) level_arg(int family, VALUE level)
{ {
/* convert SOL_SOCKET, IPPROTO_TCP, etc. */ /* convert SOL_SOCKET, IPPROTO_TCP, etc. */
return constant_arg(level, level_to_int, "unknown protocol level"); return constant_arg(level, iplevel_to_int, "unknown protocol level");
} }
int int

4
ext/socket/mkconstants.rb
View File

@ -242,7 +242,7 @@ end
def_name_to_int("family_to_int", /\A(AF_|PF_)/, "AF_") def_name_to_int("family_to_int", /\A(AF_|PF_)/, "AF_")
def_name_to_int("socktype_to_int", /\ASOCK_/, "SOCK_") def_name_to_int("socktype_to_int", /\ASOCK_/, "SOCK_")
def_name_to_int("ipproto_to_int", /\AIPPROTO_/, "IPPROTO_") def_name_to_int("ipproto_to_int", /\AIPPROTO_/, "IPPROTO_")
def_name_to_int("level_to_int", /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/) def_name_to_int("iplevel_to_int", /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
def_name_to_int("so_optname_to_int", /\ASO_/, "SO_") def_name_to_int("so_optname_to_int", /\ASO_/, "SO_")
def_name_to_int("ip_optname_to_int", /\AIP_/, "IP_") def_name_to_int("ip_optname_to_int", /\AIP_/, "IP_")
def_name_to_int("ipv6_optname_to_int", /\AIPV6_/, "IPV6_", "IPPROTO_IPV6") def_name_to_int("ipv6_optname_to_int", /\AIPV6_/, "IPV6_", "IPPROTO_IPV6")
@ -255,7 +255,7 @@ def_intern('intern_family', /\AAF_/)
def_intern('intern_protocol_family', /\APF_/) def_intern('intern_protocol_family', /\APF_/)
def_intern('intern_socktype', /\ASOCK_/) def_intern('intern_socktype', /\ASOCK_/)
def_intern('intern_ipproto', /\AIPPROTO_/) def_intern('intern_ipproto', /\AIPPROTO_/)
def_intern('intern_level', /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/) def_intern('intern_iplevel', /\A(SOL_SOCKET\z|IPPROTO_)/, /\A(SOL_|IPPROTO_)/)
def_intern('intern_so_optname', /\ASO_/, "SO_") def_intern('intern_so_optname', /\ASO_/, "SO_")
def_intern('intern_ip_optname', /\AIP_/, "IP_") def_intern('intern_ip_optname', /\AIP_/, "IP_")
def_intern('intern_ipv6_optname', /\AIPV6_/, "IPV6_") def_intern('intern_ipv6_optname', /\AIPV6_/, "IPV6_")

2
ext/socket/option.c
View File

@ -318,7 +318,7 @@ sockopt_inspect(VALUE self)
rb_str_catf(ret, " optname:%d", optname); rb_str_catf(ret, " optname:%d", optname);
} }
else { else {
level_id = intern_level(level); level_id = intern_iplevel(level);
if (level_id) if (level_id)
rb_str_catf(ret, " %s", rb_id2name(level_id)); rb_str_catf(ret, " %s", rb_id2name(level_id));
else else