kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ext/socket/ancdata.c (bsock_sendmsg_internal): use rb_scan_args

Browse source 
This should make the code more maintainable and make it easier to
add keyword argument support for "exception: false" in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2015-06-04 20:50:08 +00:00
parent 99ee18afcb
commit c467547301
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/socket/ancdata.c
View file

@ -1131,12 +1131,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
{ {
rb_io_t *fptr; rb_io_t *fptr;
VALUE data, vflags, dest_sockaddr; VALUE data, vflags, dest_sockaddr;
int controls_num;
struct msghdr mh; struct msghdr mh;
struct iovec iov; struct iovec iov;
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
VALUE controls = Qnil;
VALUE controls_str = 0; VALUE controls_str = 0;
VALUE *controls_ptr = NULL;
int family; int family;
#endif #endif
int flags; int flags;
@ -1151,20 +1150,20 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
if (argc == 0) if (argc == 0)
rb_raise(rb_eArgError, "mesg argument required"); rb_raise(rb_eArgError, "mesg argument required");
data = argv[0];
if (1 < argc) vflags = argv[1];
if (2 < argc) dest_sockaddr = argv[2];
controls_num = 3 < argc ? argc - 3 : 0;
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
if (3 < argc) { controls_ptr = &argv[3]; } rb_scan_args(argc, argv, "12*", &data, &vflags, &dest_sockaddr, &controls);
#else
rb_scan_args(argc, argv, "12", &data, &vflags, &dest_sockaddr);
#endif #endif
StringValue(data); StringValue(data);
if (controls_num) { if (!NIL_P(controls)) {
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
int i; int i;
int controls_num = RARRAY_LENINT(controls);
size_t last_pad = 0; size_t last_pad = 0;
const VALUE *controls_ptr = RARRAY_CONST_PTR(controls);
#if defined(__NetBSD__) #if defined(__NetBSD__)
int last_level = 0; int last_level = 0;
int last_type = 0; int last_type = 0;
@ -1239,6 +1238,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad); rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
#endif #endif
} }
RB_GC_GUARD(controls);
#else #else
rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented"); rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
#endif #endif