Commit 1c435295 authored by Lars Johannesen's avatar Lars Johannesen Committed by Daniel Stenberg
Browse files

bindlocal: move brace out of #ifdef 

The code within #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID wrongly had two
closing braces when it should only have one, so builds without that
define would fail.

Bug: http://curl.haxx.se/mail/lib-2013-05/0000.html
parent 46d26a0e

lib/connect.c

+9 −10
Original line number Diff line number Diff line
@@ -413,22 +413,21 @@ static CURLcode bindlocal(struct connectdata *conn, 
      if(af == AF_INET6) {

#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID

        char *scope_ptr = strchr(myhost, '%');



        if(scope_ptr) *(scope_ptr++) = 0;

        if(scope_ptr)

          *(scope_ptr++) = 0;

#endif

        if(Curl_inet_pton(AF_INET6, myhost, &si6->sin6_addr) > 0) {

          si6->sin6_family = AF_INET6;

          si6->sin6_port = htons(port);

#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID

          if(scope_ptr) {

            /* The "myhost" string either comes from Curl_if2ip or

               from Curl_printable_address. The latter returns only

               numeric scope IDs and the former returns none at all.

               So the scope ID, if present, is known to be numeric */

          if(scope_ptr)

            /* The "myhost" string either comes from Curl_if2ip or from

               Curl_printable_address. The latter returns only numeric scope

               IDs and the former returns none at all.  So the scope ID, if

               present, is known to be numeric */

            si6->sin6_scope_id = atoi(scope_ptr);

          }

        }

#endif

        }

        sizeof_sa = sizeof(struct sockaddr_in6);

      }

      else