summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-10 11:59:04 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-10 11:59:04 +0000
commit939efe7d4c17c7bc17fa4a11ef07831dd91b1306 (patch)
treec9f4fa70a56451a647ff597047b4adc9bd37af4e
parentba75dd6b95793e3a8476dc8e112ea98961d5a183 (diff)
* ext/socket/option.c (sockopt_family_m): renamed from sockopt_family.
(sockopt_level_m): renamed from sockopt_level. (sockopt_optname_m): renamed from sockopt_optname. (inspect_local_peercred): follow the renaming. (Init_sockopt): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/socket/option.c18
2 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 739af6049c..672dac5802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Feb 10 20:58:47 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/option.c (sockopt_family_m): renamed from sockopt_family.
+ (sockopt_level_m): renamed from sockopt_level.
+ (sockopt_optname_m): renamed from sockopt_optname.
+ (inspect_local_peercred): follow the renaming.
+ (Init_sockopt): ditto.
+
Tue Feb 10 20:56:07 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (anc_inspect_socket_creds): refactored to avoid
diff --git a/ext/socket/option.c b/ext/socket/option.c
index 01a371639c..afd90e560a 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -68,7 +68,7 @@ sockopt_new(int family, int level, int optname, VALUE data)
* #=> 10
*/
static VALUE
-sockopt_family(VALUE self)
+sockopt_family_m(VALUE self)
{
return rb_attr_get(self, rb_intern("family"));
}
@@ -83,7 +83,7 @@ sockopt_family(VALUE self)
* #=> 41
*/
static VALUE
-sockopt_level(VALUE self)
+sockopt_level_m(VALUE self)
{
return rb_attr_get(self, rb_intern("level"));
}
@@ -98,7 +98,7 @@ sockopt_level(VALUE self)
* #=> 2
*/
static VALUE
-sockopt_optname(VALUE self)
+sockopt_optname_m(VALUE self)
{
return rb_attr_get(self, rb_intern("optname"));
}
@@ -290,9 +290,9 @@ inspect_local_peercred(int level, int optname, VALUE data, VALUE ret)
static VALUE
sockopt_inspect(VALUE self)
{
- int family = NUM2INT(sockopt_family(self));
- int level = NUM2INT(sockopt_level(self));
- int optname = NUM2INT(sockopt_optname(self));
+ int family = NUM2INT(sockopt_family_m(self));
+ int level = NUM2INT(sockopt_level_m(self));
+ int optname = NUM2INT(sockopt_optname_m(self));
VALUE data = sockopt_data(self);
VALUE v, ret;
ID family_id, level_id, optname_id;
@@ -487,9 +487,9 @@ Init_sockopt(void)
{
rb_cSockOpt = rb_define_class_under(rb_cSocket, "Option", rb_cObject);
rb_define_method(rb_cSockOpt, "initialize", sockopt_initialize, 4);
- rb_define_method(rb_cSockOpt, "family", sockopt_family, 0);
- rb_define_method(rb_cSockOpt, "level", sockopt_level, 0);
- rb_define_method(rb_cSockOpt, "optname", sockopt_optname, 0);
+ rb_define_method(rb_cSockOpt, "family", sockopt_family_m, 0);
+ rb_define_method(rb_cSockOpt, "level", sockopt_level_m, 0);
+ rb_define_method(rb_cSockOpt, "optname", sockopt_optname_m, 0);
rb_define_method(rb_cSockOpt, "data", sockopt_data, 0);
rb_define_method(rb_cSockOpt, "inspect", sockopt_inspect, 0);