diff options
author | Damien Miller <djm@mindrot.org> | 2008-07-14 12:02:24 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-07-14 12:02:24 +1000 |
commit | ce02e5e09eb50ed9a67a3067a001092b73c0d514 (patch) | |
tree | 87b0dd1f4a4b77f079ae78563c74b8e8dd16e9e5 /openbsd-compat/bindresvport.c | |
parent | 7f980d1ac760ac7bdec1de467c6ee7071057370a (diff) | |
download | openssh-git-ce02e5e09eb50ed9a67a3067a001092b73c0d514.tar.gz |
- (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
avoid clash with sin(3) function; reported by
cristian.ionescu-idbohrn AT axis.com
Diffstat (limited to 'openbsd-compat/bindresvport.c')
-rw-r--r-- | openbsd-compat/bindresvport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index 08a53b8c..c0d5bdb5 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c @@ -54,8 +54,8 @@ bindresvport_sa(int sd, struct sockaddr *sa) { int error, af; struct sockaddr_storage myaddr; - struct sockaddr_in *sin; - struct sockaddr_in6 *sin6; + struct sockaddr_in *in; + struct sockaddr_in6 *in6; u_int16_t *portp; u_int16_t port; socklen_t salen; @@ -74,13 +74,13 @@ bindresvport_sa(int sd, struct sockaddr *sa) af = sa->sa_family; if (af == AF_INET) { - sin = (struct sockaddr_in *)sa; + in = (struct sockaddr_in *)sa; salen = sizeof(struct sockaddr_in); - portp = &sin->sin_port; + portp = &in->sin_port; } else if (af == AF_INET6) { - sin6 = (struct sockaddr_in6 *)sa; + in6 = (struct sockaddr_in6 *)sa; salen = sizeof(struct sockaddr_in6); - portp = &sin6->sin6_port; + portp = &in6->sin6_port; } else { errno = EPFNOSUPPORT; return (-1); |