generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'db42a9f5a3b8a6bb6af2d9ef42844c8dc835527b':
  Fix three clang complaints about the DNS code.
This commit is contained in:
Elliott Hughes 2014-07-07 18:02:33 +00:00 committed by Android Git Automerger
commit d5a6a5e18d
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/dns/gethnamaddr.c
View File

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

2
libc/dns/resolv/res_send.c
View File

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

3
libc/dns/resolv/res_state.c
View File

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