am d5a6a5e1: am db42a9f5: Merge "Fix three clang complaints about the DNS code."

* commit 'd5a6a5e18d66543bdfa4dffdfeec80eff32a87b9':
  Fix three clang complaints about the DNS code.
This commit is contained in:
Elliott Hughes 2014-07-07 18:08:47 +00:00 committed by Android Git Automerger
commit 88ed7d2cc1
3 changed files with 2 additions and 5 deletions

View File

@ -90,7 +90,7 @@
// This should be synchronized to ResponseCode.h
static const int DnsProxyQueryResult = 222;
static const char const AskedForGot[] =
static const char AskedForGot[] =
"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
#define MAXPACKET (64*1024)

View File

@ -1272,8 +1272,6 @@ Aerror(const res_state statp, FILE *file, const char *string, int error,
char hbuf[NI_MAXHOST];
char sbuf[NI_MAXSERV];
alen = alen;
if ((statp->options & RES_DEBUG) != 0U) {
if (getnameinfo(address, (socklen_t)alen, hbuf, sizeof(hbuf),
sbuf, sizeof(sbuf), niflags)) {

View File

@ -211,10 +211,9 @@ __res_get_state(void)
}
void
__res_put_state(res_state res)
__res_put_state(res_state res __unused)
{
/* nothing to do */
res=res;
}
res_static