diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-07 08:06:29 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-07 08:06:29 +0000 |
commit | 3117bab125d75b4b0a0cd5d405d25a3adf0e7b66 (patch) | |
tree | f1f49fff21dd447141f7997285e69e403482deae /ext | |
parent | b5470fd243b0fecc3763dff2938081411709b3d0 (diff) | |
download | ruby-3117bab125d75b4b0a0cd5d405d25a3adf0e7b66.tar.gz |
* ext/socket/socket.c (ruby_getaddrinfo, ruby_getaddrinfo__aix):
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
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/socket.c | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 88a827ec02..adeabacfc7 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -151,8 +151,8 @@ static const int lookup_order_table[] = { }; static int -ruby_getaddrinfo(char *nodename, char *servname, - struct addrinfo *hints, struct addrinfo **res) +ruby_getaddrinfo(const char *nodename, const char *servname, + const struct addrinfo *hints, struct addrinfo **res) { struct addrinfo tmp_hints; int i, af, error; @@ -183,7 +183,7 @@ ruby_getaddrinfo(char *nodename, char *servname, #if defined(_AIX) static int -ruby_getaddrinfo__aix(char *nodename, char *servname, +ruby_getaddrinfo__aix(const char *nodename, const char *servname, struct addrinfo *hints, struct addrinfo **res) { int error = getaddrinfo(nodename, servname, hints, res); @@ -201,29 +201,24 @@ ruby_getaddrinfo__aix(char *nodename, char *servname, #undef getaddrinfo #define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo__aix((node),(serv),(hints),(res)) static int -ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags) - const struct sockaddr *sa; - size_t salen; - char *host; - size_t hostlen; - char *serv; - size_t servlen; - int flags; -{ - struct sockaddr_in6 *sa6; - u_int32_t *a6; - - if (sa->sa_family == AF_INET6) { - sa6 = (struct sockaddr_in6 *)sa; - a6 = sa6->sin6_addr.u6_addr.u6_addr32; - - if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) { - strncpy(host, "::", hostlen); - snprintf(serv, servlen, "%d", sa6->sin6_port); - return 0; - } - } - return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); +ruby_getnameinfo__aix(const struct sockaddr *sa, size_t salen, + char *host, size_t hostlen, + char *serv, size_t servlen, int flags) +{ + struct sockaddr_in6 *sa6; + u_int32_t *a6; + + if (sa->sa_family == AF_INET6) { + sa6 = (struct sockaddr_in6 *)sa; + a6 = sa6->sin6_addr.u6_addr.u6_addr32; + + if (a6[0] == 0 && a6[1] == 0 && a6[2] == 0 && a6[3] == 0) { + strncpy(host, "::", hostlen); + snprintf(serv, servlen, "%d", sa6->sin6_port); + return 0; + } + } + return getnameinfo(sa, salen, host, hostlen, serv, servlen, flags); } #undef getnameinfo #define getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) \ |