diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-19 07:55:27 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-19 07:56:21 +0200 |
| commit | 640bbdf71c6f10ac26252ac67a22902e26657bd8 (patch) | |
| tree | 227d6260dda188bdc22f2d9a6b52acd77c3d68b7 /resolv/compat-gethnamaddr.c | |
| parent | 13e1f86706e463de4429f7e88f47c6ff65cd845e (diff) | |
| download | glibc-640bbdf71c6f10ac26252ac67a22902e26657bd8.tar.gz glibc-640bbdf71c6f10ac26252ac67a22902e26657bd8.tar.xz glibc-640bbdf71c6f10ac26252ac67a22902e26657bd8.zip | |
resolv: Move dn_expand to its own file and into libc
And reformat to GNU style. This switches back to the dn_expand name for the ABI symbol and turns __dn_expand into a compatibility symbol. With the improved namespace management in current glibc, it is no longer necessary to use a private namespace symbol. To avoid old code binding to a GLIBC_PRIVATE symbol by accident, use __libc_dn_expand for the internal symbol name. The symbols dn_expand, __dnexpand were moved using scripts/move-symbol-to-libc.py, followed by an adjustment to make dn_expand the only GLIBC_2.34 symbol. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'resolv/compat-gethnamaddr.c')
| -rw-r--r-- | resolv/compat-gethnamaddr.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/resolv/compat-gethnamaddr.c b/resolv/compat-gethnamaddr.c index 0e24dcbbcc..1c630fcb3d 100644 --- a/resolv/compat-gethnamaddr.c +++ b/resolv/compat-gethnamaddr.c @@ -179,7 +179,7 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) __set_h_errno (NO_RECOVERY); return (NULL); } - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = __libc_dn_expand (answer->buf, eom, cp, bp, buflen); if ((n < 0) || !(*name_ok)(bp)) { __set_h_errno (NO_RECOVERY); return (NULL); @@ -210,7 +210,7 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) haveanswer = 0; had_error = 0; while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = __libc_dn_expand (answer->buf, eom, cp, bp, buflen); if ((n < 0) || !(*name_ok)(bp)) { had_error++; continue; @@ -233,7 +233,8 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) { if (ap >= &host_aliases[MAXALIASES-1]) continue; - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); + n = __libc_dn_expand (answer->buf, eom, cp, + tbuf, sizeof tbuf); if ((n < 0) || !(*name_ok)(tbuf)) { had_error++; continue; @@ -265,7 +266,8 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) continue; } if (qtype == T_PTR && type == T_CNAME) { - n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf); + n = __libc_dn_expand (answer->buf, eom, cp, + tbuf, sizeof tbuf); if (n < 0 || !res_dnok(tbuf)) { had_error++; continue; @@ -302,7 +304,8 @@ getanswer (const querybuf *answer, int anslen, const char *qname, int qtype) cp += n; continue; /* XXX - had_error++ ? */ } - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = __libc_dn_expand (answer->buf, eom, cp, + bp, buflen); if ((n < 0) || !res_hnok(bp)) { had_error++; break; |