From: Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically
Date: Thu, 15 Jul 2021 00:59:56 -0400 [thread overview]
Message-ID: <c4300bd4-ec88-680d-8773-69e3edc4aedb@redhat.com> (raw)
In-Reply-To: <79eddf954fc3cc1e1c47ce37ace2d463c3210652.1625755445.git.fweimer@redhat.com>
On 7/8/21 10:59 AM, Florian Weimer via Libc-alpha wrote:
This will make refactoring and cleanup much easier and avoid potential
future conflicts. Thanks for the cleanup.
OK for glibc 2.34.
Tested without regression on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> resolv/Makefile | 61 ++++++++++++---
> resolv/Versions | 194 ++++++++++++++++++++++++++++++++----------------
> 2 files changed, 182 insertions(+), 73 deletions(-)
>
> diff --git a/resolv/Makefile b/resolv/Makefile
> index 1d3565d478..f14b149b31 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -27,9 +27,21 @@ headers := resolv.h bits/types/res_state.h \
> arpa/nameser.h arpa/nameser_compat.h \
> sys/bitypes.h
>
> -routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \
> - res_hconf res_libc res-state res_randomid res-close \
> - resolv_context resolv_conf
> +routines := \
> + herror \
> + inet_addr \
> + inet_ntop \
> + inet_pton \
> + nsap_addr \
> + res-close \
> + res-state \
> + res_hconf \
> + res_init \
> + res_libc \
> + res_randomid \
> + resolv_conf \
> + resolv_context \
> + # routines
OK. YAYAYAYAY! :-)
>
> tests = tst-aton tst-leaks tst-inet_ntop
> tests-container = tst-leaks2
> @@ -105,15 +117,37 @@ xtests += tst-resolv-qtypes
> xtests += tst-resolv-rotate
> endif
> extra-libs-others = $(extra-libs)
> -libresolv-routines := res_comp res_debug \
> - res_data res_mkquery res_query res_send \
> - inet_net_ntop inet_net_pton inet_neta base64 \
> - ns_parse ns_name ns_netint ns_ttl ns_print \
> - ns_samedomain ns_date res_enable_icmp \
> - compat-hooks compat-gethnamaddr
> +libresolv-routines := \
> + base64 \
> + compat-gethnamaddr \
> + compat-hooks \
> + inet_net_ntop \
> + inet_net_pton \
> + inet_neta \
> + ns_date \
> + ns_name \
> + ns_netint \
> + ns_parse \
> + ns_print \
> + ns_samedomain \
> + ns_ttl \
> + res_comp \
> + res_data \
> + res_debug \
> + res_enable_icmp \
> + res_mkquery \
> + res_query \
> + res_send \
> + # libresolv-routines
OK.
>
> $(libanl-routines-var) += \
> - gai_cancel gai_error gai_misc gai_notify gai_suspend getaddrinfo_a
> + gai_cancel \
> + gai_error \
> + gai_misc \
> + gai_notify \
> + gai_suspend \
> + getaddrinfo_a \
> + # $(libanl-routines-var)
OK.
>
> libanl-routines += libanl-compat
> libanl-shared-only-routines += libanl-compat
> @@ -121,7 +155,12 @@ libanl-shared-only-routines += libanl-compat
> subdir-dirs = nss_dns
> vpath %.c nss_dns
>
> -libnss_dns-routines := dns-host dns-network dns-canon
> +libnss_dns-routines := \
> + dns-canon \
> + dns-host \
> + dns-network \
> + # libnss_dns-routines
OK.
> +
> libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes))
> ifeq ($(build-static-nss),yes)
> routines += $(libnss_dns-routines) $(libresolv-routines)
> diff --git a/resolv/Versions b/resolv/Versions
> index d4f6b4b819..3b5328301a 100644
> --- a/resolv/Versions
> +++ b/resolv/Versions
> @@ -1,115 +1,182 @@
> libc {
> GLIBC_2.0 {
> - _res;
> -
> - # helper functions
> __h_errno_location;
> -
> - # functions used in other libraries
> __res_randomid;
> -
> - # variables in normal name space
> - h_errlist; h_nerr;
> -
> - # h*
> - herror; hstrerror;
> -
> - # r*
> + _res;
> + h_errlist;
> + h_nerr;
> + herror;
> + hstrerror;
OK.
> res_init;
> }
> GLIBC_2.2 {
> - # r*
> - __res_state; __res_init; __res_nclose; __res_ninit; _res_hconf;
> + __res_init;
> + __res_nclose;
> + __res_ninit;
> + __res_state;
> + _res_hconf;
OK.
> }
> GLIBC_2.2.3 {
> %if PTHREAD_IN_LIBC
> - gai_cancel; gai_error; gai_suspend; getaddrinfo_a;
> + gai_cancel;
> + gai_error;
> + gai_suspend;
> + getaddrinfo_a;
OK.
> %endif
> }
> GLIBC_2.34 {
> %if PTHREAD_IN_LIBC
> - gai_cancel; gai_error; gai_suspend; getaddrinfo_a;
> + gai_cancel;
> + gai_error;
> + gai_suspend;
> + getaddrinfo_a;
OK.
> %endif
> }
> GLIBC_PRIVATE {
> %if !PTHREAD_IN_LIBC
> __gai_sigqueue;
> %endif
> -
> - __h_errno; __resp;
> -
> - __res_iclose;
> + __h_errno;
> __inet_aton_exact;
> __inet_pton_length;
> + __res_iclose;
> __resolv_context_get;
> - __resolv_context_get_preinit;
> __resolv_context_get_override;
> + __resolv_context_get_preinit;
> __resolv_context_put;
> + __resp;
OK.
> }
> }
>
> libresolv {
> GLIBC_2.0 {
> - _gethtbyaddr; _gethtbyname; _gethtbyname2; _gethtent; _getlong;
> - _getshort; _res_opcodes; _res_resultcodes; _sethtent; dn_expand;
> - inet_net_ntop; inet_net_pton; inet_neta; res_gethostbyaddr;
> - res_gethostbyname; res_gethostbyname2; res_mkquery; res_query;
> - res_querydomain; res_search; res_send_setqhook; res_send_setrhook;
> - # Variables
> - __p_class_syms; __p_type_syms;
> - # Private routines shared between libc/net, named, nslookup and others.
> - __b64_ntop; __b64_pton;
> - __dn_comp; __dn_count_labels; __dn_skipname;
> - __fp_nquery; __fp_query; __fp_resstat; __hostalias;
> - __loc_aton; __loc_ntoa;
> - __p_cdname; __p_cdnname; __p_class; __p_fqname; __p_fqnname; __p_option;
> - __p_query; __p_rr; __p_secstodate; __p_time; __p_type;
> - __putlong; __putshort;
> - __res_close; __res_dnok; __res_hnok; __res_isourserver; __res_mailok;
> - __res_nameinquery; __res_ownok; __res_queriesmatch;
> + __b64_ntop;
> + __b64_pton;
> + __dn_comp;
> + __dn_count_labels;
> + __dn_skipname;
> + __fp_nquery;
> + __fp_query;
> + __fp_resstat;
> + __hostalias;
> + __loc_aton;
> + __loc_ntoa;
> + __p_cdname;
> + __p_cdnname;
> + __p_class;
> + __p_class_syms;
> + __p_fqname;
> + __p_fqnname;
> + __p_option;
> + __p_query;
> + __p_rr;
> + __p_secstodate;
> + __p_time;
> + __p_type;
> + __p_type_syms;
> + __putlong;
> + __putshort;
> + __res_close;
> + __res_dnok;
> + __res_hnok;
> + __res_isourserver;
> + __res_mailok;
> + __res_nameinquery;
> + __res_ownok;
> + __res_queriesmatch;
> __res_send;
> - __sym_ntop; __sym_ntos; __sym_ston;
> + __sym_ntop;
> + __sym_ntos;
> + __sym_ston;
> + _gethtbyaddr;
> + _gethtbyname2;
> + _gethtbyname;
> + _gethtent;
> + _getlong;
> + _getshort;
> + _res_opcodes;
> + _res_resultcodes;
> + _sethtent;
> + dn_expand;
> + inet_net_ntop;
> + inet_net_pton;
> + inet_neta;
> + res_gethostbyaddr;
> + res_gethostbyname2;
> + res_gethostbyname;
> + res_mkquery;
> + res_query;
> + res_querydomain;
> + res_search;
> + res_send_setqhook;
> + res_send_setrhook;
OK.
> }
> GLIBC_2.2 {
> __dn_expand;
> - __res_hostalias; __res_mkquery; __res_nmkquery; __res_nquery;
> - __res_nquerydomain; __res_nsearch; __res_nsend; __res_query;
> - __res_querydomain; __res_search;
> + __res_hostalias;
> + __res_mkquery;
> + __res_nmkquery;
> + __res_nquery;
> + __res_nquerydomain;
> + __res_nsearch;
> + __res_nsend;
> + __res_query;
> + __res_querydomain;
> + __res_search;
> }
> GLIBC_2.3.2 {
> __p_rcode;
> }
> GLIBC_2.9 {
> - ns_msg_getflag;
> - ns_get16; ns_get32; ns_put16; ns_put32;
> - ns_initparse; ns_skiprr; ns_parserr;
> - ns_sprintrr; ns_sprintrrf;
> - ns_format_ttl; ns_parse_ttl;
> ns_datetosecs;
> - ns_name_ntol; ns_name_ntop; ns_name_pton;
> - ns_name_unpack; ns_name_pack;
> - ns_name_uncompress; ns_name_compress;
> - ns_name_skip; ns_name_rollback;
> - ns_samedomain; ns_subdomain; ns_makecanon; ns_samename;
> + ns_format_ttl;
> + ns_get16;
> + ns_get32;
> + ns_initparse;
> + ns_makecanon;
> + ns_msg_getflag;
> + ns_name_compress;
> + ns_name_ntol;
> + ns_name_ntop;
> + ns_name_pack;
> + ns_name_pton;
> + ns_name_rollback;
> + ns_name_skip;
> + ns_name_uncompress;
> + ns_name_unpack;
> + ns_parse_ttl;
> + ns_parserr;
> + ns_put16;
> + ns_put32;
> + ns_samedomain;
> + ns_samename;
> + ns_skiprr;
> + ns_sprintrr;
> + ns_sprintrrf;
> + ns_subdomain;
OK.
> }
> GLIBC_PRIVATE {
> - # Needed in libnss_dns.
> - __ns_name_unpack; __ns_name_ntop;
> - __ns_get16; __ns_get32;
> + __ns_get16;
> + __ns_get32;
> + __ns_name_ntop;
> + __ns_name_unpack;
> + __res_context_hostalias;
> __res_context_query;
> __res_context_search;
> - __res_context_hostalias;
OK.
> }
> }
>
> libnss_dns {
> GLIBC_PRIVATE {
> - _nss_dns_gethostbyaddr_r; _nss_dns_gethostbyname2_r;
> - _nss_dns_gethostbyname3_r;
> - _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
> - _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
> + _nss_dns_getcanonname_r;
> _nss_dns_gethostbyaddr2_r;
> + _nss_dns_gethostbyaddr_r;
> + _nss_dns_gethostbyname2_r;
> + _nss_dns_gethostbyname3_r;
> _nss_dns_gethostbyname4_r;
> + _nss_dns_gethostbyname_r;
> + _nss_dns_getnetbyaddr_r;
> + _nss_dns_getnetbyname_r;
OK.
> }
> }
>
> @@ -118,7 +185,10 @@ libanl {
> %if PTHREAD_IN_LIBC
> __libanl_version_placeholder;
> %else
> - gai_cancel; gai_error; gai_suspend; getaddrinfo_a;
> + gai_cancel;
> + gai_error;
> + gai_suspend;
> + getaddrinfo_a;
OK.
> %endif
> }
> }
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-07-15 5:01 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 14:59 [PATCH v2 00/30] nss_dns move into libc Florian Weimer via Libc-alpha
2021-07-08 14:59 ` [PATCH 01/30] socket: Add hidden prototype for setsockopt Florian Weimer via Libc-alpha
2021-07-08 18:02 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 02/30] resolv: Deprecate legacy interfaces in <resolv.h> Florian Weimer via Libc-alpha
2021-07-08 18:32 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically Florian Weimer via Libc-alpha
2021-07-08 18:33 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha [this message]
2021-07-08 15:00 ` [PATCH 04/30] nss_dns: Do not use deprecated packet parsing functions Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 05/30] resolv: Move ns_name_ntop to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 06/30] resolv: Move ns_name_unpack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 07/30] resolv: Move ns_name_skip " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-15 6:53 ` Florian Weimer via Libc-alpha
2021-07-08 15:00 ` [PATCH 08/30] resolv: Move ns_name_uncompress into " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 09/30] resolv: Move ns_name_pton " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 10/30] resolv: Move ns_name_pack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 11/30] resolv: Move ns_name_compress " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 12/30] resolv: Move dn_expand to " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 14/30] resolv: Move dn_comp to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 15/30] resolv: Move dn_skipname " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 16/30] resolv: Rename res_comp.c to res-name-checking.c and move " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 17/30] resolv: Remove unnecessary res_isourserver_p call from send_dg Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 18/30] resolv: Move __res_get_nsaddr to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 20/30] resolv: Move ns_makecanon into its own file, and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 21/30] resolv: Move ns_samename " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 22/30] resolv: Move res_nameinquery to its own file " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 23/30] resolv: Move res_queriesmatch " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 24/30] resolv: Move __res_context_hostalias into " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 26/30] resolv: Move res_send, res_nsend into libc Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 27/30] resolv: Move res_mkquery, res_nmkquery " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 28/30] resolv: Move res_query functions " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 29/30] resolv: Move nss_dns " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 30/30] nss: Directly load nss_dns, without going through dlsym/dlopen Florian Weimer via Libc-alpha
2021-07-08 15:42 ` Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-15 7:09 ` Florian Weimer via Libc-alpha
2021-07-15 12:21 ` Carlos O'Donell via Libc-alpha
2021-07-15 4:58 ` [PATCH v2 00/30] nss_dns move into libc Carlos O'Donell via Libc-alpha
-- strict thread matches above, loose matches on Subject: below --
2021-07-02 18:47 [PATCH 00/30] Move nss_dns " Florian Weimer via Libc-alpha
2021-07-02 18:47 ` [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically Florian Weimer via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4300bd4-ec88-680d-8773-69e3edc4aedb@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=carlos@redhat.com \
--cc=fweimer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).