diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2015-01-09 09:35:57 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2015-01-09 09:35:57 +0100 |
| commit | c721682c223d10215d936b2e98fa476407647bf8 (patch) | |
| tree | 7ade98b773a6f15c520ddc28de1ad4cc966fd323 /smtpd/parser.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | avoid shadowing sin() (diff) | |
| download | OpenSMTPD-c721682c223d10215d936b2e98fa476407647bf8.tar.xz OpenSMTPD-c721682c223d10215d936b2e98fa476407647bf8.zip | |
Merge branch 'master' into portable
Conflicts:
smtpd/parser.c
Diffstat (limited to 'smtpd/parser.c')
| -rw-r--r-- | smtpd/parser.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/smtpd/parser.c b/smtpd/parser.c index 5e854e06..842a398b 100644 --- a/smtpd/parser.c +++ b/smtpd/parser.c @@ -280,8 +280,8 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) { struct in_addr ina; struct in6_addr in6a; - struct sockaddr_in *sin; - struct sockaddr_in6 *sin6; + struct sockaddr_in *in; + struct sockaddr_in6 *in6; char *cp, *str2; const char *errstr; @@ -295,13 +295,13 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) if (inet_pton(PF_INET, str, &ina) != 1) return (-1); - sin = (struct sockaddr_in *)sa; - memset(sin, 0, sizeof *sin); + in = (struct sockaddr_in *)sa; + memset(in, 0, sizeof *in); #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN - sin->sin_len = sizeof(struct sockaddr_in); + in->sin_len = sizeof(struct sockaddr_in); #endif - sin->sin_family = PF_INET; - sin->sin_addr.s_addr = ina.s_addr; + in->sin_family = PF_INET; + in->sin_addr.s_addr = ina.s_addr; return (0); case PF_INET6: @@ -320,13 +320,13 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) } else if (inet_pton(PF_INET6, str, &in6a) != 1) return (-1); - sin6 = (struct sockaddr_in6 *)sa; - memset(sin6, 0, sizeof *sin6); + in6 = (struct sockaddr_in6 *)sa; + memset(in6, 0, sizeof *in6); #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN - sin6->sin6_len = sizeof(struct sockaddr_in6); + in6->sin6_len = sizeof(struct sockaddr_in6); #endif - sin6->sin6_family = PF_INET6; - sin6->sin6_addr = in6a; + in6->sin6_family = PF_INET6; + in6->sin6_addr = in6a; if (cp == NULL) return (0); @@ -334,10 +334,10 @@ text_to_sockaddr(struct sockaddr *sa, int family, const char *str) if (IN6_IS_ADDR_LINKLOCAL(&in6a) || IN6_IS_ADDR_MC_LINKLOCAL(&in6a) || IN6_IS_ADDR_MC_NODELOCAL(&in6a)) - if ((sin6->sin6_scope_id = if_nametoindex(cp))) + if ((in6->sin6_scope_id = if_nametoindex(cp))) return (0); - sin6->sin6_scope_id = strtonum(cp, 0, UINT32_MAX, &errstr); + in6->sin6_scope_id = strtonum(cp, 0, UINT32_MAX, &errstr); if (errstr) return (-1); return (0); |