diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-08-02 08:26:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-08-02 08:26:10 +0000 |
| commit | 2fb513c60061821c7e5e7fb6014d2afd0308b7e9 (patch) | |
| tree | c7d9546bed03277ec2921a1b2cbda1f78620450b /resolv/nss_dns | |
| parent | c7045198ca8f4ff5b97205340d51127f8503c2bd (diff) | |
Updated to fedora-glibc-20080802T0809cvs/fedora-glibc-2_8_90-11
Diffstat (limited to 'resolv/nss_dns')
| -rw-r--r-- | resolv/nss_dns/dns-canon.c | 4 | ||||
| -rw-r--r-- | resolv/nss_dns/dns-host.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c index cee3d57bc1..50a0fc0260 100644 --- a/resolv/nss_dns/dns-canon.c +++ b/resolv/nss_dns/dns-canon.c @@ -134,14 +134,14 @@ _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen, if (type != ns_t_cname) goto unavail; - if (ns_get16 (ptr) != ns_c_in) + if (__ns_get16 (ptr) != ns_c_in) goto unavail; /* Also skip over the TTL. */ ptr += sizeof (uint16_t) + sizeof (uint32_t); /* Skip over the data length and data. */ - ptr += sizeof (uint16_t) + ns_get16 (ptr); + ptr += sizeof (uint16_t) + __ns_get16 (ptr); } } } diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 80c0bd9fa8..4d43dec946 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -698,13 +698,13 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype, continue; } - type = ns_get16 (cp); + type = __ns_get16 (cp); cp += INT16SZ; /* type */ - class = ns_get16 (cp); + class = __ns_get16 (cp); cp += INT16SZ; /* class */ - ttl = ns_get32 (cp); + ttl = __ns_get32 (cp); cp += INT32SZ; /* TTL */ - n = ns_get16 (cp); + n = __ns_get16 (cp); cp += INT16SZ; /* len */ if (__builtin_expect (class != C_IN, 0)) { @@ -1032,13 +1032,13 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, continue; } - int type = ns_get16 (cp); + int type = __ns_get16 (cp); cp += INT16SZ; /* type */ - int class = ns_get16 (cp); + int class = __ns_get16 (cp); cp += INT16SZ; /* class */ - int32_t ttl = ns_get32 (cp); + int32_t ttl = __ns_get32 (cp); cp += INT32SZ; /* TTL */ - n = ns_get16 (cp); + n = __ns_get16 (cp); cp += INT16SZ; /* len */ if (class != C_IN) |