diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 15:59:10 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 15:59:10 +0000 |
| commit | 7f9b7f37364908c6beb940dbac9b2a2782d9df29 (patch) | |
| tree | ca298128a1041c1a1fff2e5a77513ef7e0a190ea /ext | |
| parent | 7867001c6223325fea1845391ce153bd1bb30d9b (diff) | |
| download | ruby-7f9b7f37364908c6beb940dbac9b2a2782d9df29.tar.gz ruby-7f9b7f37364908c6beb940dbac9b2a2782d9df29.tar.xz ruby-7f9b7f37364908c6beb940dbac9b2a2782d9df29.zip | |
* ext/socket/socket.c (family_arg): accept symbols as well.
(socktype_arg): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/socket.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 94244fc5a..7b7aa416a 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -249,9 +249,13 @@ family_arg(VALUE domain) char *ptr; int ret; - tmp = rb_check_string_type(domain); - if (!NIL_P(tmp)) { + if (SYMBOL_P(domain)) { + domain = rb_sym_to_s(domain); + goto str; + } + else if (!NIL_P(tmp = rb_check_string_type(domain))) { domain = tmp; + str: rb_check_safe_obj(domain); ptr = RSTRING_PTR(domain); if (family_to_int(ptr, RSTRING_LEN(domain), &ret) == -1) @@ -271,9 +275,13 @@ socktype_arg(VALUE type) char *ptr; int ret; - tmp = rb_check_string_type(type); - if (!NIL_P(tmp)) { + if (SYMBOL_P(type)) { + type = rb_sym_to_s(type); + goto str; + } + else if (!NIL_P(tmp = rb_check_string_type(type))) { type = tmp; + str: rb_check_safe_obj(type); ptr = RSTRING_PTR(type); if (socktype_to_int(ptr, RSTRING_LEN(type), &ret) == -1) |