From 002177069b979eb9dca0338fd62736d3ee2a90fb Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 9 Feb 2009 13:56:43 +0000 Subject: * ext/socket/rubysocket.h (level_arg): add family argument. (optname_arg): ditto. (cmsg_type_arg): ditto. (rb_sock_getfamily): declared. * ext/socket/constants.c (level_arg): add family argument. (optname_arg): ditto. (cmsg_type_arg): ditto. * ext/socket/init.c (rb_sock_getfamily): defined. * ext/socket/option.c (sockopt_initialize): give family for level_arg and optname_arg. (sockopt_s_int): ditto. * ext/socket/basicsocket.c (bsock_setsockopt): ditto. (bsock_getsockopt): ditto. * ext/socket/ancdata.c (ancillary_initialize): ditto. (ancillary_s_int): ditto. (ancillary_cmsg_is_p): ditto. (bsock_sendmsg_internal): ditto. (bsock_recvmsg_internal): use rb_sock_getfamily. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/option.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/socket/option.c') diff --git a/ext/socket/option.c b/ext/socket/option.c index 900b99a59..e09cb79ae 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -38,8 +38,8 @@ static VALUE sockopt_initialize(VALUE self, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE data) { int family = family_arg(vfamily); - int level = level_arg(vlevel); - int optname = optname_arg(level, voptname); + int level = level_arg(family, vlevel); + int optname = optname_arg(family, level, voptname); StringValue(data); rb_ivar_set(self, rb_intern("family"), INT2NUM(family)); rb_ivar_set(self, rb_intern("level"), INT2NUM(level)); @@ -133,8 +133,8 @@ static VALUE sockopt_s_int(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE vint) { int family = family_arg(vfamily); - int level = level_arg(vlevel); - int optname = optname_arg(level, voptname); + int level = level_arg(family, vlevel); + int optname = optname_arg(family, level, voptname); int i = NUM2INT(vint); return sockopt_new(family, level, optname, rb_str_new((char*)&i, sizeof(i))); } -- cgit