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_debug.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_debug.c')
| -rw-r--r-- | resolv/res_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 844269cffa..030df0aa90 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -335,7 +335,7 @@ p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) { char name[MAXDNAME]; int n; - if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0) + if ((n = __libc_dn_expand (msg, msg + len, cp, name, sizeof name)) < 0) return (NULL); if (name[0] == '\0') putc('.', file); @@ -359,7 +359,7 @@ p_fqnname (const u_char *cp, const u_char *msg, int msglen, char *name, { int n, newlen; - if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0) + if ((n = __libc_dn_expand (msg, cp + msglen, cp, name, namelen)) < 0) return (NULL); newlen = strlen(name); if (newlen == 0 || name[newlen - 1] != '.') { |