From patchwork Fri Jun 27 17:35:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1802 Received: (qmail 6184 invoked by alias); 27 Jun 2014 18:00:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 6169 invoked by uid 89); 27 Jun 2014 18:00:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.5 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Fri, 27 Jun 2014 23:05:01 +0530 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH] Remove MULTI_PTRS_ARE_ALIASES to fix Wundef warning Message-ID: <20140627173501.GA12370@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) The macro has been unconditionally defined as 1 in gethnamaddr.c and not defined at all in dns-host.c. As a result, the code excluded by the macro has been dead for a while (since 1995 for gethnamaddr.c). Removing the excluded bits do not cause any change to the generated code on x86_64. Siddhesh * resolv/gethnamaddr.c: Remove definition of MULTI_PTRS_ARE_ALIASES. (getanswer) [!MULTI_PTRS_ARE_ALIASES]: Remove code. * resolv/nss_dns/dns-host.c (getanswer_r) [MULTI_PTRS_ARE_ALIASES]: Likewise. --- resolv/gethnamaddr.c | 18 ------------------ resolv/nss_dns/dns-host.c | 22 ---------------------- 2 files changed, 40 deletions(-) diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index c73a0dc..9bbed59 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -73,8 +73,6 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; # define LOG_AUTH 0 #endif -#define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */ - #if defined(BSD) && (BSD >= 199103) && defined(AF_INET6) # include # include @@ -359,7 +357,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) had_error++; break; } -#if MULTI_PTRS_ARE_ALIASES cp += n; if (cp != erdata) { __set_h_errno (NO_RECOVERY); @@ -381,21 +378,6 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) buflen -= n; } break; -#else - host.h_name = bp; - if (_res.options & RES_USE_INET6) { - n = strlen(bp) + 1; /* for the \0 */ - if (n >= MAXHOSTNAMELEN) { - had_error++; - break; - } - bp += n; - buflen -= n; - map_v4v6_hostent(&host, &bp, &buflen); - } - __set_h_errno (NETDB_SUCCESS); - return (&host); -#endif case T_A: case T_AAAA: if (strcasecmp(host.h_name, bp) != 0) { diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index a5f2c0a..258618e 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -869,27 +869,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, ++had_error; break; } -#if MULTI_PTRS_ARE_ALIASES - cp += n; - if (haveanswer == 0) - result->h_name = bp; - else if (ap < &host_data->aliases[MAXALIASES-1]) - *ap++ = bp; - else - n = -1; - if (n != -1) - { - n = strlen (bp) + 1; /* for the \0 */ - if (__builtin_expect (n, 0) >= MAXHOSTNAMELEN) - { - ++had_error; - break; - } - bp += n; - linebuflen -= n; - } - break; -#else result->h_name = bp; if (have_to_map) { @@ -906,7 +885,6 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, } *h_errnop = NETDB_SUCCESS; return NSS_STATUS_SUCCESS; -#endif case T_A: case T_AAAA: if (__builtin_expect (strcasecmp (result->h_name, bp), 0) != 0)