From 05346c25cbc2f6845917c64bf6df5b3f455ee7fb Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Fri, 20 Apr 2012 20:42:41 +0200 Subject: [PATCH] Android: small changes to dns property part. Prefix prop vars; kill var; use DNS_PROP_NAME_PREFIX macro. --- ares_init.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ares_init.c b/ares_init.c index fa9e1d7..863b3b0 100644 --- a/ares_init.c +++ b/ares_init.c @@ -62,7 +62,9 @@ #if defined(ANDROID) || defined(__ANDROID__) #include -#define MAX_DNS_PROPERTIES 8 /* From the Bionic sources */ +/* From the Bionic sources */ +#define DNS_PROP_NAME_PREFIX "net.dns" +#define MAX_DNS_PROPERTIES 8 #endif #include "ares.h" @@ -955,17 +957,16 @@ DhcpNameServer #elif defined(ANDROID) || defined(__ANDROID__) unsigned int i; - char name[PROP_NAME_MAX]; - char value[PROP_VALUE_MAX]=""; - int len; + char propname[PROP_NAME_MAX]; + char propvalue[PROP_VALUE_MAX]=""; + for (i = 1; i <= MAX_DNS_PROPERTIES; i++) { - snprintf(name, sizeof(name), "net.dns%u", i); - len = __system_property_get(name, value); - if (len < 1) { + snprintf(propname, sizeof(propname), "%s%u", DNS_PROP_NAME_PREFIX, i); + if (__system_property_get(propname, propvalue) < 1) { status = ARES_EOF; break; } - status = config_nameserver(&servers, &nservers, value); + status = config_nameserver(&servers, &nservers, propvalue); if (status != ARES_SUCCESS) break; status = ARES_EOF; -- 2.7.4