diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-26 09:44:30 +0000 |
| commit | c3301189bde66bceb3e949e4938b167fc847dd86 (patch) | |
| tree | 2e449aae3fb42846f0338645ed73ef6311341902 /inet/getnameinfo.c | |
| parent | 8b6e67674da3b9db3208b914bd8d892abb62ec48 (diff) | |
Update.
2000-11-26 Ulrich Drepper <drepper@redhat.com>
* inet/getnameinfo.c: Adjust casts to avoid warnings.
* inet/rcmd.c: Likewise.
* inet/ruserpass.c: Likewise.
* inet/netinet/in.h (IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_LOOPBACK,
IN6_IS_ADDR_MULTICAST, IN6_IS_ADDR_LINKLOCAL, IN6_IS_ADDR_SITELOCAL,
IN6_IS_ADDR_V4MAPPED, IN6_IS_ADDR_V4COMPAT, IN6_ARE_ADDR_EQUAL,
IN6_IS_ADDR_MC_NODELOCAL, IN6_IS_ADDR_MC_LINKLOCAL,
IN6_IS_ADDR_MC_SITELOCAL, IN6_IS_ADDR_MC_ORGLOCAL,
IN6_IS_ADDR_MC_GLOBAL): Preserve const in cast.
* include/aliases.h: Add prototypes for internal __getalias* functions.
* include/netdb.h: Add prototypes for __old_gethostent_r,
__old_gethostbyaddr_r, __old_gethostbyname_r, __old_gethostbyname2_r,
__old_getnetent_r, __old_getnetbyaddr_r, __old_getnetbyname_r,
__old_getservent_r, __old_getservbyname_r, __old_getservbyport_r,
__old_getprotoent_r, __old_getprotobyname_r, __old_getprotobynumber_r.
* include/rpc/netdb.h: Add prototypes for __old_getrpcbyname_r,
__old_getrpcbynumber_r, __old_getrpcent_r.
* include/rpc/netdb.h: Add __getrpcbyname_r, __getrpcbynumber_r,
__getrpcent_r prototypes.
Diffstat (limited to 'inet/getnameinfo.c')
| -rw-r--r-- | inet/getnameinfo.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 25a8af7a6c..435ba76ee5 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -211,7 +211,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, { if (sa->sa_family == AF_INET6) { - while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in6 *) sa)->sin6_addr), + while (__gethostbyaddr_r ((const void *) &(((const struct sockaddr_in6 *) sa)->sin6_addr), sizeof(struct in6_addr), AF_INET6, &th, tmpbuf, tmpbuflen, &h, &herrno)) @@ -238,7 +238,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, } else { - while (__gethostbyaddr_r ((void *) &(((struct sockaddr_in *)sa)->sin_addr), + while (__gethostbyaddr_r ((const void *) &(((const struct sockaddr_in *)sa)->sin_addr), sizeof(struct in_addr), AF_INET, &th, tmpbuf, tmpbuflen, &h, &herrno)) @@ -290,11 +290,13 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, const char *c; if (sa->sa_family == AF_INET6) { - struct sockaddr_in6 *sin6p = (struct sockaddr_in6 *) sa; + const struct sockaddr_in6 *sin6p; uint32_t scopeid; + sin6p = (const struct sockaddr_in6 *) sa; + c = inet_ntop (AF_INET6, - (void *) &sin6p->sin6_addr, host, hostlen); + (const void *) &sin6p->sin6_addr, host, hostlen); scopeid = sin6p->sin6_scope_id; if (scopeid != 0) { @@ -336,7 +338,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, } else c = inet_ntop (AF_INET, - (void *) &(((struct sockaddr_in *) sa)->sin_addr), + (const void *) &(((const struct sockaddr_in *) sa)->sin_addr), host, hostlen); if (c == NULL) { @@ -381,7 +383,7 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, if (!(flags & NI_NUMERICSERV)) { struct servent *s, ts; - while (__getservbyport_r (((struct sockaddr_in *) sa)->sin_port, + while (__getservbyport_r (((const struct sockaddr_in *) sa)->sin_port, ((flags & NI_DGRAM) ? "udp" : "tcp"), &ts, tmpbuf, tmpbuflen, &s)) { @@ -410,11 +412,11 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host, } } __snprintf (serv, servlen, "%d", - ntohs (((struct sockaddr_in *) sa)->sin_port)); + ntohs (((const struct sockaddr_in *) sa)->sin_port)); break; case AF_LOCAL: - strncpy (serv, ((struct sockaddr_un *) sa)->sun_path, servlen); + strncpy (serv, ((const struct sockaddr_un *) sa)->sun_path, servlen); break; } |