summaryrefslogtreecommitdiff
path: root/lib/asyn-ares.c
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-09-17 20:59:43 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-09-17 20:59:43 +0100
commit158dfe2c5c9e45faa1364c21782b0fd693d32354 (patch)
treec2dc570fa95c95a8735520308a947142c5124bf9 /lib/asyn-ares.c
parent8f5336a2fad1395cf19fd8d6272777569feb45bd (diff)
downloadcurl-158dfe2c5c9e45faa1364c21782b0fd693d32354.tar.gz
dns: fix compilation with MinGW from commit df69440d05f113
Avoid 'interface' literal that some MinGW versions define as a macro Additionally, corrected some very, very minor coding style errors.
Diffstat (limited to 'lib/asyn-ares.c')
-rw-r--r--lib/asyn-ares.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index fa12f21de..0ef36cbbe 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -625,15 +625,18 @@ CURLcode Curl_set_dns_servers(struct SessionHandle *data,
}
CURLcode Curl_set_dns_interface(struct SessionHandle *data,
- const char *interface)
+ const char *interf)
{
#if (ARES_VERSION >= 0x010704)
- if(!interface) interface = "";
- ares_set_local_dev((ares_channel)data->state.resolver, interface);
+ if(!interf)
+ interf = "";
+
+ ares_set_local_dev((ares_channel)data->state.resolver, interf);
+
return CURLE_OK;
#else /* c-ares version too old! */
(void)data;
- (void)interface;
+ (void)interf;
return CURLE_NOT_BUILT_IN;
#endif
}
@@ -652,7 +655,9 @@ CURLcode Curl_set_dns_local_ip4(struct SessionHandle *data,
return CURLE_BAD_FUNCTION_ARGUMENT;
}
}
+
ares_set_local_ip4((ares_channel)data->state.resolver, ntohl(a4));
+
return CURLE_OK;
#else /* c-ares version too old! */
(void)data;
@@ -676,7 +681,9 @@ CURLcode Curl_set_dns_local_ip6(struct SessionHandle *data,
return CURLE_BAD_FUNCTION_ARGUMENT;
}
}
+
ares_set_local_ip6((ares_channel)data->state.resolver, a6);
+
return CURLE_OK;
#else /* c-ares version too old! */
(void)data;