diff mbox

[COMMITTED] resolv: Remove traces of ULTRIX support

Message ID 20160428120848.23C71403F10AA@oldenburg.str.redhat.com
State New
Headers show

Commit Message

Florian Weimer April 28, 2016, 12:08 p.m. UTC 
2016-04-28  Florian Weimer  <fweimer@redhat.com>

	* resolv/res_comp.c: Remove code conditional on __ultrix__.
	* resolv/res_data.c: Remove code conditional on ultrix.
diff mbox

Patch

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