From 820bb23ff074db8255217ab01b51f28c96ec76a9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 15 Jul 2021 08:28:50 +0200 Subject: resolv: Move ns_name_unpack to its own file and into libc Reformat to GNU style. Avoid out-of-bounds buffer arithmetic. Eliminate the labellen function. The symbol was moved using scripts/move-symbol-to-libc.py. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 2 ++ sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/x86_64') diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index a2485563c3..a535ca6172 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -2369,6 +2369,7 @@ GLIBC_2.34 mtx_timedlock F GLIBC_2.34 mtx_trylock F GLIBC_2.34 mtx_unlock F GLIBC_2.34 ns_name_ntop F +GLIBC_2.34 ns_name_unpack F GLIBC_2.34 openpty F GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F GLIBC_2.34 pthread_attr_getaffinity_np F @@ -2635,4 +2636,5 @@ GLIBC_2.9 dup3 F GLIBC_2.9 epoll_create1 F GLIBC_2.9 inotify_init1 F GLIBC_2.9 ns_name_ntop F +GLIBC_2.9 ns_name_unpack F GLIBC_2.9 pipe2 F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist index 954af66409..34277a3732 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libresolv.abilist @@ -77,7 +77,6 @@ GLIBC_2.9 ns_name_pton F GLIBC_2.9 ns_name_rollback F GLIBC_2.9 ns_name_skip F GLIBC_2.9 ns_name_uncompress F -GLIBC_2.9 ns_name_unpack F GLIBC_2.9 ns_parse_ttl F GLIBC_2.9 ns_parserr F GLIBC_2.9 ns_put16 F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index ab5e32eee0..6cd8b9a537 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -1412,6 +1412,7 @@ GLIBC_2.16 nl_langinfo_l F GLIBC_2.16 nrand48 F GLIBC_2.16 nrand48_r F GLIBC_2.16 ns_name_ntop F +GLIBC_2.16 ns_name_unpack F GLIBC_2.16 ntohl F GLIBC_2.16 ntohs F GLIBC_2.16 ntp_adjtime F @@ -2469,6 +2470,7 @@ GLIBC_2.34 mtx_timedlock F GLIBC_2.34 mtx_trylock F GLIBC_2.34 mtx_unlock F GLIBC_2.34 ns_name_ntop F +GLIBC_2.34 ns_name_unpack F GLIBC_2.34 openpty F GLIBC_2.34 posix_spawn_file_actions_addclosefrom_np F GLIBC_2.34 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist index 79b4bbdd98..16eca4411d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libresolv.abilist @@ -72,7 +72,6 @@ GLIBC_2.16 ns_name_pton F GLIBC_2.16 ns_name_rollback F GLIBC_2.16 ns_name_skip F GLIBC_2.16 ns_name_uncompress F -GLIBC_2.16 ns_name_unpack F GLIBC_2.16 ns_parse_ttl F GLIBC_2.16 ns_parserr F GLIBC_2.16 ns_put16 F -- cgit 1.4.1