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/res_send.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/res_send.c')
| -rw-r--r-- | resolv/res_send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolv/res_send.c b/resolv/res_send.c index a70f3dec05..b6139c7d62 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -268,7 +268,7 @@ res_nameinquery(const char *name, int type, int class, char tname[MAXDNAME+1]; int n, ttype, tclass; - n = dn_expand(buf, eom, cp, tname, sizeof tname); + n = __libc_dn_expand (buf, eom, cp, tname, sizeof tname); if (n < 0) return (-1); cp += n; @@ -381,7 +381,7 @@ res_queriesmatch(const u_char *buf1, const u_char *eom1, char tname[MAXDNAME+1]; int n, ttype, tclass; - n = dn_expand(buf1, eom1, cp, tname, sizeof tname); + n = __libc_dn_expand (buf1, eom1, cp, tname, sizeof tname); if (n < 0) return (-1); cp += n; |