about summary refs log tree commit diff
path: root/resolv/ns_print.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-07-19 07:55:27 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-07-19 07:56:21 +0200
commit640bbdf71c6f10ac26252ac67a22902e26657bd8 (patch)
tree227d6260dda188bdc22f2d9a6b52acd77c3d68b7 /resolv/ns_print.c
parent13e1f86706e463de4429f7e88f47c6ff65cd845e (diff)
downloadglibc-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/ns_print.c')
-rw-r--r--resolv/ns_print.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolv/ns_print.c b/resolv/ns_print.c
index d61f5044b1..9a9602d74c 100644
--- a/resolv/ns_print.c
+++ b/resolv/ns_print.c
@@ -693,7 +693,7 @@ addname(const u_char *msg, size_t msglen,
 	char *save_buf = *buf;
 	int n;
 
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
+	n = __libc_dn_expand (msg, msg + msglen, *pp, *buf, *buflen);
 	if (n < 0)
 		goto enospc;	/*%< Guess. */
 	newlen = prune_origin(*buf, origin);