diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-02 08:22:36 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-02 08:22:36 +0000 |
commit | b5aebd12c003342a68ca756b2a43c17b1ff254c1 (patch) | |
tree | 53412ededf9490e28c0659dc08d0180a494684e3 /ext/socket/socket.c | |
parent | 9ce8d4e3b964774294c88d9414fdf4a92c352709 (diff) |
* ext/socket/mkconstants.rb: use ID in the values of
family_to_str_hash. family_to_str returns a VALUE.
* ext/socket/socket.c (ipaddr): follow family_to_str change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
-rw-r--r-- | ext/socket/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b50747a5e1..76cb4ae045 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1061,11 +1061,11 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup) VALUE ary; int error; char hbuf[1024], pbuf[1024]; - char *name; - name = family_to_str(sockaddr->sa_family); - if (name) - family = rb_str_new2(name); + family = family_to_str(sockaddr->sa_family); + if (!NIL_P(family)) { + family = rb_str_dup(family); + } else { sprintf(pbuf, "unknown:%d", sockaddr->sa_family); family = rb_str_new2(pbuf); |