diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 08:38:14 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 08:38:14 +0000 |
| commit | c3af1a6ad575e055b369e6987b74a42bcedf4e0d (patch) | |
| tree | 745475bca7b2cc50145b76fcc418031567a010d8 /ext/socket/socket.c | |
| parent | 22a8052436422c96ad2948ecce074777fc1872a1 (diff) | |
| download | ruby-c3af1a6ad575e055b369e6987b74a42bcedf4e0d.tar.gz ruby-c3af1a6ad575e055b369e6987b74a42bcedf4e0d.tar.xz ruby-c3af1a6ad575e055b369e6987b74a42bcedf4e0d.zip | |
* ext/socket/mkconstants.rb: generate socktype_to_int.
* ext/socket/socket.c (setup_domain_and_type): use socktype_to_int.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 4bf7fc021..61f72e7ea 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -2281,6 +2281,7 @@ unix_peeraddr(VALUE sock) #endif static int family_to_int(char *str, int len); +static int socktype_to_int(char *str, int len); static void setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv) @@ -2304,31 +2305,14 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv) } tmp = rb_check_string_type(type); if (!NIL_P(tmp)) { + int socktype; type = tmp; rb_check_safe_obj(type); ptr = RSTRING_PTR(type); - if (strcmp(ptr, "SOCK_STREAM") == 0) - *tv = SOCK_STREAM; - else if (strcmp(ptr, "SOCK_DGRAM") == 0) - *tv = SOCK_DGRAM; -#ifdef SOCK_RAW - else if (strcmp(ptr, "SOCK_RAW") == 0) - *tv = SOCK_RAW; -#endif -#ifdef SOCK_SEQPACKET - else if (strcmp(ptr, "SOCK_SEQPACKET") == 0) - *tv = SOCK_SEQPACKET; -#endif -#ifdef SOCK_RDM - else if (strcmp(ptr, "SOCK_RDM") == 0) - *tv = SOCK_RDM; -#endif -#ifdef SOCK_PACKET - else if (strcmp(ptr, "SOCK_PACKET") == 0) - *tv = SOCK_PACKET; -#endif - else + socktype = socktype_to_int(ptr, RSTRING_LEN(type)); + if (socktype == -1) rb_raise(rb_eSocket, "unknown socket type %s", ptr); + *tv = socktype; } else { *tv = NUM2INT(type); |