Commit b7f740f2 authored by Steve Holme's avatar Steve Holme
Browse files

ip2ip.c: Fixed compilation warning when IPv6 Scope ID not supported 

if2ip.c:119: warning: unused parameter 'remote_scope_id'

...and some minor code style policing in the same function.
parent cdc1cc22

lib/if2ip.c

+12 −3
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, 


#ifndef ENABLE_IPV6

  (void) remote_scope;



#ifndef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID

  (void) remote_scope_id;

#endif



#endif



  if(getifaddrs(&head) >= 0) {
@@ -157,7 +162,9 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, 


              /* If given, scope id should match. */

              if(remote_scope_id && scopeid != remote_scope_id) {

                if(res == IF2IP_NOT_FOUND) res = IF2IP_AF_NOT_SUPPORTED;

                if(res == IF2IP_NOT_FOUND)

                  res = IF2IP_AF_NOT_SUPPORTED;



                continue;

              }

#endif
@@ -179,8 +186,10 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope, 
        }

      }

    }



    freeifaddrs(head);

  }



  return res;

}