kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/socket.c (ruby_getaddrinfo, ruby_getaddrinfo__aix):

Browse source 
constified.

* ext/socket/socket.c (ruby_getnameinfo__aix): protoized.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-07 08:06:29 +00:00
parent b5470fd243
commit 3117bab125
1 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ext/socket/socket.c
View file

@ -151,8 +151,8 @@ static const int lookup_order_table[] = {
}; };
static int static int
ruby_getaddrinfo(char *nodename, char *servname, ruby_getaddrinfo(const char *nodename, const char *servname,
struct addrinfo *hints, struct addrinfo **res) const struct addrinfo *hints, struct addrinfo **res)
{ {
struct addrinfo tmp_hints; struct addrinfo tmp_hints;
int i, af, error; int i, af, error;
@ -183,7 +183,7 @@ ruby_getaddrinfo(char *nodename, char *servname,
#if defined(_AIX) #if defined(_AIX)
static int static int
ruby_getaddrinfo__aix(char *nodename, char *servname, ruby_getaddrinfo__aix(const char *nodename, const char *servname,
struct addrinfo *hints, struct addrinfo **res) struct addrinfo *hints, struct addrinfo **res)
{ {
int error = getaddrinfo(nodename, servname, hints, res); int error = getaddrinfo(nodename, servname, hints, res);
@ -201,29 +201,24 @@ ruby_getaddrinfo__aix(char *nodename, char *servname,
#undef getaddrinfo #undef getaddrinfo
#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res)) #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res))
static int static int
ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags) ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen,
const struct sockaddr *sa; char *host, size_t hostlen,
size_t salen; char *serv, size_t servlen, int flags)
char *host;
size_t hostlen;
char *serv;
size_t servlen;
int flags;
{ {
struct sockaddr_in6 *sa6; struct sockaddr_in6 *sa6;
u_int32_t *a6; u_int32_t *a6;
if (sa->sa_family == AF_INET6) { if (sa->sa_family == AF_INET6) {
sa6 = (struct sockaddr_in6 *)sa; sa6 = (struct sockaddr_in6 *)sa;
a6 = sa6->sin6_addr.u6_addr.u6_addr32; a6 = sa6->sin6_addr.u6_addr.u6_addr32;
if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) { if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) {
strncpy(host, "::", hostlen); strncpy(host, "::", hostlen);
snprintf(serv, servlen, "%d", sa6->sin6_port); snprintf(serv, servlen, "%d", sa6->sin6_port);
return 0; return 0;
}
} }
} return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags);
} }
#undef getnameinfo #undef getnameinfo
#define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \ #define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \