From b5aebd12c003342a68ca756b2a43c17b1ff254c1 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 2 Jan 2009 08:22:36 +0000 Subject: * 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 --- ext/socket/socket.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/socket/socket.c') 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); -- cgit v1.2.3