ruby-changes:9815
From: nobu <ko1@a...>
Date: Tue, 6 Jan 2009 19:19:34 +0900 (JST)
Subject: [ruby-changes:9815] Ruby:r21356 (trunk): * ext/socket/socket.c (io_call_close, io_close, pair_yield):
nobu 2009-01-06 19:18:44 +0900 (Tue, 06 Jan 2009) New Revision: 21356 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21356 Log: * ext/socket/socket.c (io_call_close, io_close, pair_yield): unused unless socketpair exists. * ext/socket/getnameinfo.c (getnameinfo): moved conditinally used variable. Modified files: trunk/ext/socket/getnameinfo.c trunk/ext/socket/socket.c Index: ext/socket/socket.c =================================================================== --- ext/socket/socket.c (revision 21355) +++ ext/socket/socket.c (revision 21356) @@ -2428,6 +2428,7 @@ return init_sock(sock, fd); } +#if defined HAVE_SOCKETPAIR static VALUE io_call_close(VALUE io) { @@ -2445,6 +2446,7 @@ { return rb_ensure(rb_yield, pair, io_close, rb_ary_entry(pair, 1)); } +#endif static VALUE sock_s_socketpair(VALUE klass, VALUE domain, VALUE type, VALUE protocol) Index: ext/socket/getnameinfo.c =================================================================== --- ext/socket/getnameinfo.c (revision 21355) +++ ext/socket/getnameinfo.c (revision 21356) @@ -135,7 +135,6 @@ getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags) { struct afd *afd; - struct servent *sp; struct hostent *hp; u_short port; int family, len, i; @@ -177,7 +176,7 @@ strcpy(serv, numserv); } else { #if defined(HAVE_GETSERVBYPORT) - sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp"); + struct servent *sp = getservbyport(port, (flags & NI_DGRAM) ? "udp" : "tcp"); if (sp) { if (strlen(sp->s_name) + 1 > servlen) return ENI_MEMORY; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/