- (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

diff --git a/ChangeLog b/ChangeLog
index 1580b8b331f55603ff0be400f5d6fdcc39499502..f47d8c4ab5066f11853772690f6aa6ac3309a742 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
      increase number of piplelined requests so they properly fill the
      (recently increased) channel window. prompted by rapier AT psc.edu;
      ok markus@
+ - (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
 
 20080712
  - (djm) OpenBSD CVS Sync

diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 08a53b8cd4863898f1f1338fc9705716be70e676..c0d5bdb5c33518bbac44ecd1ec8d5208a5f4c107 100644 (file)
--- 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);