diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-06-10 12:45:09 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-06-10 22:44:20 -0700 |
| commit | 5615eaf26469f20c2d8c3be5770e12564a1edfff (patch) | |
| tree | cf9eb7a5797cd7c9dd4680b0463859dcd8376328 /resolv | |
| parent | b68e08db76547937ea6e1902e87a5ea98c906f0c (diff) | |
| download | glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.gz glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.tar.xz glibc-5615eaf26469f20c2d8c3be5770e12564a1edfff.zip | |
Quash some new warnings from GCC 4.6.
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/nss_dns/dns-network.c | 7 | ||||
| -rw-r--r-- | resolv/res_hconf.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index c9969e08dc..b51db9eed4 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004, 2007, 2008 - Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2002,2004,2007,2008,2011 + Free Software Foundation, Inc. This file is part of the GNU C Library. Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -293,7 +293,6 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, const unsigned char *cp = &answer->buf[HFIXEDSZ]; char **alias_pointer; int have_answer; - char *ans; u_char packtmp[NS_MAXCDNAME]; if (question_count == 0) @@ -328,7 +327,6 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, alias_pointer = result->n_aliases = &net_data->aliases[0]; *alias_pointer = NULL; have_answer = 0; - ans = NULL; while (--answer_count >= 0 && cp < end_of_message) { @@ -351,7 +349,6 @@ getanswer_r (const querybuf *answer, int anslen, struct netent *result, if (n < 0 || res_dnok (bp) == 0) break; cp += n; - ans = strdupa (bp); GETSHORT (type, cp); GETSHORT (class, cp); cp += INT32SZ; /* TTL */ diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index ed55bec296..fc4b83f7c3 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-2006, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1993,1995-2006,2007,2009,2011 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger (davidm@azstarnet.com). @@ -461,7 +462,7 @@ _res_hconf_reorder_addrs (struct hostent *hp) cleanup: /* Release lock, preserve error value, and close socket. */ - save = errno; + errno = save; num_ifs = new_num_ifs; |