romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 06:23:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

misc: remove unused data when IPv6 is not supported

Browse source 
Closes #8430
This commit is contained in:
MAntoniak 2022-02-07 20:47:09 +01:00 • committed by Daniel Stenberg
parent ae5e57c304
commit 06eb208126
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 52 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/if2ip.c
View file

@ -92,19 +92,19 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
#if defined(HAVE_GETIFADDRS)
if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
unsigned int local_scope_id, const char *interf,
if2ip_result_t Curl_if2ip(int af,
#ifdef ENABLE_IPV6
unsigned int remote_scope,
unsigned int local_scope_id,
#endif
const char *interf,
char *buf, int buf_size)
{
struct ifaddrs *iface, *head;
if2ip_result_t res = IF2IP_NOT_FOUND;
#ifndef ENABLE_IPV6
(void) remote_scope;
#endif
#if !defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) || \
!defined(ENABLE_IPV6)
#if defined(ENABLE_IPV6) && \
!defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
(void) local_scope_id;
#endif
@ -177,8 +177,12 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
#elif defined(HAVE_IOCTL_SIOCGIFADDR)
if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
unsigned int local_scope_id, const char *interf,
if2ip_result_t Curl_if2ip(int af,
#ifdef ENABLE_IPV6
unsigned int remote_scope,
unsigned int local_scope_id,
#endif
const char *interf,
char *buf, int buf_size)
{
struct ifreq req;
@ -188,8 +192,10 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
size_t len;
const char *r;
#ifdef ENABLE_IPV6
(void)remote_scope;
(void)local_scope_id;
#endif
if(!interf || (af != AF_INET))
return IF2IP_NOT_FOUND;
@ -226,13 +232,19 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
#else
if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
unsigned int local_scope_id, const char *interf,
if2ip_result_t Curl_if2ip(int af,
#ifdef ENABLE_IPV6
unsigned int remote_scope,
unsigned int local_scope_id,
#endif
const char *interf,
char *buf, int buf_size)
{
(void) af;
#ifdef ENABLE_IPV6
(void) remote_scope;
(void) local_scope_id;
#endif
(void) interf;
(void) buf;
(void) buf_size;