OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolv: Remove traces of ULTRIX support

This commit is contained in:
Florian Weimer 2016-04-28 11:51:02 +02:00
parent 18b36f5dcf
commit 687c1c0ce2
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

2
resolv/res_comp.c
View File

@ -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*/

17
resolv/res_data.c
View File

@ -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