oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

avoid shadowing sin

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15412 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-16 16:53:09 +00:00
parent 761bb32c40
commit 101d943acc
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/roken/getnameinfo.c
View File

@@ -113,10 +113,10 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen,
} }
#endif #endif
case AF_INET : { case AF_INET : {
const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; const struct sockaddr_in *sin4 = (const struct sockaddr_in *)sa;
return doit (AF_INET, &sin->sin_addr, sizeof(sin->sin_addr), return doit (AF_INET, &sin4->sin_addr, sizeof(sin4->sin_addr),
sin->sin_port, sin4->sin_port,
host, hostlen, host, hostlen,
serv, servlen, serv, servlen,
flags); flags);

32
lib/roken/socket.c
View File

@@ -48,12 +48,12 @@ socket_set_any (struct sockaddr *sa, int af)
{ {
switch (af) { switch (af) {
case AF_INET : { case AF_INET : {
struct sockaddr_in *sin = (struct sockaddr_in *)sa; struct sockaddr_in *sin4 = (struct sockaddr_in *)sa;
memset (sin, 0, sizeof(*sin)); memset (sin4, 0, sizeof(*sin4));
sin->sin_family = AF_INET; sin4->sin_family = AF_INET;
sin->sin_port = 0; sin4->sin_port = 0;
sin->sin_addr.s_addr = INADDR_ANY; sin4->sin_addr.s_addr = INADDR_ANY;
break; break;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@@ -82,12 +82,12 @@ socket_set_address_and_port (struct sockaddr *sa, const void *ptr, int port)
{ {
switch (sa->sa_family) { switch (sa->sa_family) {
case AF_INET : { case AF_INET : {
struct sockaddr_in *sin = (struct sockaddr_in *)sa; struct sockaddr_in *sin4 = (struct sockaddr_in *)sa;
memset (sin, 0, sizeof(*sin)); memset (sin4, 0, sizeof(*sin4));
sin->sin_family = AF_INET; sin4->sin_family = AF_INET;
sin->sin_port = port; sin4->sin_port = port;
memcpy (&sin->sin_addr, ptr, sizeof(struct in_addr)); memcpy (&sin4->sin_addr, ptr, sizeof(struct in_addr));
break; break;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@@ -156,8 +156,8 @@ socket_get_address (struct sockaddr *sa)
{ {
switch (sa->sa_family) { switch (sa->sa_family) {
case AF_INET : { case AF_INET : {
struct sockaddr_in *sin = (struct sockaddr_in *)sa; struct sockaddr_in *sin4 = (struct sockaddr_in *)sa;
return &sin->sin_addr; return &sin4->sin_addr;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case AF_INET6 : { case AF_INET6 : {
@@ -180,8 +180,8 @@ socket_get_port (const struct sockaddr *sa)
{ {
switch (sa->sa_family) { switch (sa->sa_family) {
case AF_INET : { case AF_INET : {
const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; const struct sockaddr_in *sin4 = (const struct sockaddr_in *)sa;
return sin->sin_port; return sin4->sin_port;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case AF_INET6 : { case AF_INET6 : {
@@ -204,8 +204,8 @@ socket_set_port (struct sockaddr *sa, int port)
{ {
switch (sa->sa_family) { switch (sa->sa_family) {
case AF_INET : { case AF_INET : {
struct sockaddr_in *sin = (struct sockaddr_in *)sa; struct sockaddr_in *sin4 = (struct sockaddr_in *)sa;
sin->sin_port = port; sin4->sin_port = port;
break; break;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6