diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-11-17 21:56:08 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-11-17 21:56:08 +0000 |
| commit | 913a0f6c362c8c9aac72f800485678845a60ed06 (patch) | |
| tree | 227afb2373db8f9494b69c20069cce6a03ab0914 /libc/resolv | |
| parent | 86abb02796d5bfc0c71d46ad9923ff8737e03280 (diff) | |
Merge changes between r15584 and r15868 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15869 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv')
| -rw-r--r-- | libc/resolv/getaddrinfo_a.c | 6 | ||||
| -rw-r--r-- | libc/resolv/gethnamaddr.c | 6 | ||||
| -rw-r--r-- | libc/resolv/res_hconf.c | 2 | ||||
| -rw-r--r-- | libc/resolv/res_query.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libc/resolv/getaddrinfo_a.c b/libc/resolv/getaddrinfo_a.c index f6af3aa45..6f4ad8d81 100644 --- a/libc/resolv/getaddrinfo_a.c +++ b/libc/resolv/getaddrinfo_a.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. @@ -125,8 +125,8 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig) while (total > 0) { #ifdef DONT_NEED_GAI_MISC_COND - int result; - GAI_MISC_WAIT (result, total, NULL, 1); + int not_used __attribute__ ((unused)); + GAI_MISC_WAIT (not_used, total, NULL, 1); #else pthread_cond_wait (&cond, &__gai_requests_mutex); #endif diff --git a/libc/resolv/gethnamaddr.c b/libc/resolv/gethnamaddr.c index 5cf660a8d..a8ccf1fd3 100644 --- a/libc/resolv/gethnamaddr.c +++ b/libc/resolv/gethnamaddr.c @@ -585,7 +585,7 @@ gethostbyname2(name, af) } if (!isdigit(*cp) && *cp != '.') break; - } + } if ((isxdigit(name[0]) && strchr(name, ':') != NULL) || name[0] == ':') for (cp = name;; ++cp) { @@ -787,7 +787,7 @@ _sethtent(f) int f; { if (!hostf) - hostf = fopen(_PATH_HOSTS, "r" ); + hostf = fopen(_PATH_HOSTS, "rce" ); else rewind(hostf); stayopen = f; @@ -810,7 +810,7 @@ _gethtent() register char *cp, **q; int af, len; - if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" ))) { + if (!hostf && !(hostf = fopen(_PATH_HOSTS, "rce" ))) { __set_h_errno (NETDB_INTERNAL); return (NULL); } diff --git a/libc/resolv/res_hconf.c b/libc/resolv/res_hconf.c index 7b167bb3b..6f831ec6b 100644 --- a/libc/resolv/res_hconf.c +++ b/libc/resolv/res_hconf.c @@ -307,7 +307,7 @@ do_init (void) if (hconf_name == NULL) hconf_name = _PATH_HOSTCONF; - fp = fopen (hconf_name, "rc"); + fp = fopen (hconf_name, "rce"); if (fp) { /* No threads using this stream. */ diff --git a/libc/resolv/res_query.c b/libc/resolv/res_query.c index 2f7cfaa4b..947c6513a 100644 --- a/libc/resolv/res_query.c +++ b/libc/resolv/res_query.c @@ -602,7 +602,7 @@ res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) { if (statp->options & RES_NOALIASES) return (NULL); file = getenv("HOSTALIASES"); - if (file == NULL || (fp = fopen(file, "r")) == NULL) + if (file == NULL || (fp = fopen(file, "rce")) == NULL) return (NULL); setbuf(fp, NULL); buf[sizeof(buf) - 1] = '\0'; |