traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Silence warnings in MSVC++: hide unused variables, add constness back to 

inet_pton/ntop, convert htons argument to u_short.
This commit is contained in:
Martin v. Löwis 2001-07-21 09:42:15 +00:00
parent 20f51a7b38
commit c925b1538a
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/getaddrinfo.c
View File

@ -343,7 +343,7 @@ getaddrinfo(hostname, servname, hints, res)
pai->ai_socktype = SOCK_DGRAM;
pai->ai_protocol = IPPROTO_UDP;
}
port = htons(atoi(servname));
port = htons((u_short)atoi(servname));
} else {
struct servent *sp;
char *proto;
@ -417,7 +417,9 @@ getaddrinfo(hostname, servname, hints, res)
for (i = 0; gai_afdl[i].a_af; i++) {
if (inet_pton(gai_afdl[i].a_af, hostname, pton)) {
u_long v4a;
#ifdef INET6
u_char pfx;
#endif
switch (gai_afdl[i].a_af) {
case AF_INET:
@ -492,7 +494,10 @@ get_name(addr, gai_afd, res, numaddr, pai, port0)
u_short port = port0 & 0xffff;
struct hostent *hp;
struct addrinfo *cur;
int error = 0, h_error;
int error = 0;
#ifdef INET6
int h_error;
#endif
#ifdef INET6
hp = getipnodebyaddr(addr, gai_afd->a_addrlen, gai_afd->a_af, &h_error);

2
Modules/getnameinfo.c
View File

@ -98,7 +98,9 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
int family, len, i;
char *addr, *p;
u_long v4a;
#ifdef INET6
u_char pfx;
#endif
int h_error;
char numserv[512];
char numaddr[512];

10
Modules/socketmodule.c
View File

@ -207,8 +207,8 @@ Socket methods:
#endif /* USE_SSL */
#ifndef HAVE_INET_PTON
int inet_pton (int af, char *src, void *dst);
char *inet_ntop(int af, void *src, char *dst, socklen_t size);
int inet_pton (int af, const char *src, void *dst);
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
#endif
/* I know this is a bad practice, but it is the easiest... */
@ -2948,7 +2948,7 @@ init_socket(void)
/* Simplistic emulation code for inet_pton that only works for IPv4 */
#ifndef HAVE_INET_PTON
int
inet_pton (int af, char *src, void *dst)
inet_pton (int af, const char *src, void *dst)
{
if(af == AF_INET){
long packed_addr;
@ -2966,8 +2966,8 @@ inet_pton (int af, char *src, void *dst)
return -1;
}
char *
inet_ntop(int af, void *src, char *dst, socklen_t size)
const char *
inet_ntop(int af, const void *src, char *dst, socklen_t size)
{
if (af == AF_INET) {
struct in_addr packed_addr;