resolv: Remove traces of ULTRIX support

diff --git a/ChangeLog b/ChangeLog
index 26147f54e31a280f37214de5832026cf0fa8550a..e5cf1d0df623d70a1689886efc0328cc993d89e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2016-04-28  Florian Weimer  <fweimer@redhat.com>
 
        * resolv/res_init.c (RFC1535): Do not define.  Remove

diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index 3c50774d644ba06714e818b19bbcd60d36505530..d2be5e4560a0396ff4c7a3afebe0e29b9c6c63d8 100644 (file)
--- 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*/
 \f
 

diff --git a/resolv/res_data.c b/resolv/res_data.c
index 3c196dee662ea015fa1e6f6db0d7cb890e8d62a3..7e848e0945db79217b337bc66ebb7630efb63b47 100644 (file)
--- 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
 \f