From patchwork Thu Apr 28 12:08:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 11934 Received: (qmail 9802 invoked by alias); 28 Apr 2016 12:08:56 -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 9643 invoked by uid 89); 28 Apr 2016 12:08:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1424 X-HELO: mx1.redhat.com Date: Thu, 28 Apr 2016 14:08:48 +0200 To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] resolv: Remove traces of ULTRIX support User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20160428120848.23C71403F10AA@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-04-28 Florian Weimer * resolv/res_comp.c: Remove code conditional on __ultrix__. * resolv/res_data.c: Remove code conditional on ultrix. diff --git a/resolv/res_comp.c b/resolv/res_comp.c index 3c50774..d2be5e4 100644 --- a/resolv/res_comp.c +++ b/resolv/res_comp.c @@ -241,10 +241,8 @@ void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } libresolv_hidden_def (__putlong) void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } libresolv_hidden_def (__putshort) -#ifndef __ultrix__ u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); } u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); } -#endif /*__ultrix__*/ #endif /*BIND_4_COMPAT*/ diff --git a/resolv/res_data.c b/resolv/res_data.c index 3c196de..7e848e0 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -186,23 +186,6 @@ hostalias(const char *name) { } libresolv_hidden_def (hostalias) -#ifdef ultrix -int -local_hostname_length(const char *hostname) { - int len_host, len_domain; - - if (!*_res.defdname) - res_init(); - len_host = strlen(hostname); - len_domain = strlen(_res.defdname); - if (len_host > len_domain && - !strcasecmp(hostname + len_host - len_domain, _res.defdname) && - hostname[len_host - len_domain - 1] == '.') - return (len_host - len_domain - 1); - return (0); -} -#endif /*ultrix*/ - #endif