moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

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

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

...and some minor code style policing in the same function.
This commit is contained in:
Steve Holme 2014-12-26 13:28:29 +00:00
parent cdc1cc22e7
commit b7f740f2fc
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/if2ip.c
View File

@ -124,16 +124,21 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
#ifndef ENABLE_IPV6 #ifndef ENABLE_IPV6
(void) remote_scope; (void) remote_scope;
#ifndef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
(void) remote_scope_id;
#endif
#endif #endif
if(getifaddrs(&head) >= 0) { if(getifaddrs(&head) >= 0) {
for(iface=head; iface != NULL; iface=iface->ifa_next) { for(iface = head; iface != NULL; iface=iface->ifa_next) {
if(iface->ifa_addr != NULL) { if(iface->ifa_addr != NULL) {
if(iface->ifa_addr->sa_family == af) { if(iface->ifa_addr->sa_family == af) {
if(curl_strequal(iface->ifa_name, interf)) { if(curl_strequal(iface->ifa_name, interf)) {
void *addr; void *addr;
char *ip; char *ip;
char scope[12]=""; char scope[12] = "";
char ipstr[64]; char ipstr[64];
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
if(af == AF_INET6) { if(af == AF_INET6) {
@ -157,7 +162,9 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
/* If given, scope id should match. */ /* If given, scope id should match. */
if(remote_scope_id && scopeid != remote_scope_id) { 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; continue;
} }
#endif #endif
@ -179,8 +186,10 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
} }
} }
} }
freeifaddrs(head); freeifaddrs(head);
} }
return res; return res;
} }