From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Arjun Shankar <arjun@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 11/16] Move 'networks' routines from 'inet' into 'nss'
Date: Fri, 20 Oct 2023 09:17:53 -0300 [thread overview]
Message-ID: <99b2c980-513c-4a79-8e02-e6511c95e7a0@linaro.org> (raw)
In-Reply-To: <20231002130150.1497733-12-arjun@redhat.com>
On 02/10/23 09:55, Arjun Shankar wrote:
> The getnetby* and getnetent* routines are entry points for nss
> functionality. This commit moves them from the 'inet' subdirectory to
> 'nss'.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> inet/Makefile | 12 ------------
> inet/Versions | 3 +--
> nss/Makefile | 19 +++++++++++++++++++
> nss/Versions | 2 ++
> {inet => nss}/getnetbyad.c | 0
> {inet => nss}/getnetbyad_r.c | 0
> {inet => nss}/getnetbynm.c | 0
> {inet => nss}/getnetbynm_r.c | 0
> {inet => nss}/getnetent.c | 0
> {inet => nss}/getnetent_r.c | 0
> 10 files changed, 22 insertions(+), 14 deletions(-)
> rename {inet => nss}/getnetbyad.c (100%)
> rename {inet => nss}/getnetbyad_r.c (100%)
> rename {inet => nss}/getnetbynm.c (100%)
> rename {inet => nss}/getnetbynm_r.c (100%)
> rename {inet => nss}/getnetent.c (100%)
> rename {inet => nss}/getnetent_r.c (100%)
>
> diff --git a/inet/Makefile b/inet/Makefile
> index 9f39f7ff2b..776cbfa0fd 100644
> --- a/inet/Makefile
> +++ b/inet/Makefile
> @@ -48,12 +48,6 @@ routines := \
> ether_ntoa_r \
> getipv4sourcefilter \
> getnameinfo \
> - getnetbyad \
> - getnetbyad_r \
> - getnetbynm \
> - getnetbynm_r \
> - getnetent \
> - getnetent_r \
> getproto \
> getproto_r \
> getprtent \
> @@ -144,12 +138,6 @@ include ../gen-locales.mk
> ifeq ($(have-thread-library),yes)
>
> CFLAGS-rcmd.c += -fexceptions
> -CFLAGS-getnetbynm_r.c += -fexceptions
> -CFLAGS-getnetbynm.c += -fexceptions
> -CFLAGS-getnetbyad_r.c += -fexceptions
> -CFLAGS-getnetbyad.c += -fexceptions
> -CFLAGS-getnetent_r.c += -fexceptions
> -CFLAGS-getnetent.c += -fexceptions
> CFLAGS-getrpcent_r.c += -fexceptions
> CFLAGS-getrpcent.c += -fexceptions
> CFLAGS-getservent_r.c += -fexceptions
> diff --git a/inet/Versions b/inet/Versions
> index 1ffa444730..051b305e48 100644
> --- a/inet/Versions
> +++ b/inet/Versions
> @@ -14,8 +14,7 @@ libc {
> ether_ntoa_r;
>
> # g*
> - getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname;
> - getnetbyname_r; getnetent; getnetent_r;
> + getdomainname;
> getprotobyname; getprotobyname_r; getprotobynumber;
> getprotobynumber_r; getprotoent; getprotoent_r;
> getservbyname; getservbyname_r; getservbyport;
> diff --git a/nss/Makefile b/nss/Makefile
> index 2a451f68d9..023a11fa4b 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -159,6 +159,25 @@ CFLAGS-getnetgrent.c += -fexceptions
> CFLAGS-getnetgrent_r.c += -fexceptions
> endif
>
> +# networks routines:
> +routines += \
> + getnetbyad \
> + getnetbyad_r \
> + getnetbynm \
> + getnetbynm_r \
> + getnetent \
> + getnetent_r \
> + # routines
> +
> +ifeq ($(have-thread-library),yes)
> +CFLAGS-getnetbyad.c += -fexceptions
> +CFLAGS-getnetbyad_r.c += -fexceptions
> +CFLAGS-getnetbynm.c += -fexceptions
> +CFLAGS-getnetbynm_r.c += -fexceptions
> +CFLAGS-getnetent.c += -fexceptions
> +CFLAGS-getnetent_r.c += -fexceptions
> +endif
> +
> # pwd routines:
> routines += \
> fgetpwent \
> diff --git a/nss/Versions b/nss/Versions
> index 4ddc018012..95219f0fc7 100644
> --- a/nss/Versions
> +++ b/nss/Versions
> @@ -25,6 +25,8 @@ libc {
> gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2;
> gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r;
> getnetgrent; getnetgrent_r;
> + getnetbyaddr; getnetbyaddr_r; getnetbyname; getnetbyname_r;
> + getnetent; getnetent_r;
> getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
> getspent; getspent_r; getspnam; getspnam_r;
>
> diff --git a/inet/getnetbyad.c b/nss/getnetbyad.c
> similarity index 100%
> rename from inet/getnetbyad.c
> rename to nss/getnetbyad.c
> diff --git a/inet/getnetbyad_r.c b/nss/getnetbyad_r.c
> similarity index 100%
> rename from inet/getnetbyad_r.c
> rename to nss/getnetbyad_r.c
> diff --git a/inet/getnetbynm.c b/nss/getnetbynm.c
> similarity index 100%
> rename from inet/getnetbynm.c
> rename to nss/getnetbynm.c
> diff --git a/inet/getnetbynm_r.c b/nss/getnetbynm_r.c
> similarity index 100%
> rename from inet/getnetbynm_r.c
> rename to nss/getnetbynm_r.c
> diff --git a/inet/getnetent.c b/nss/getnetent.c
> similarity index 100%
> rename from inet/getnetent.c
> rename to nss/getnetent.c
> diff --git a/inet/getnetent_r.c b/nss/getnetent_r.c
> similarity index 100%
> rename from inet/getnetent_r.c
> rename to nss/getnetent_r.c
next prev parent reply other threads:[~2023-10-20 12:17 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:55 [PATCH 00/16] Consolidate NSS functionality into nss subdir Arjun Shankar
2023-10-02 12:55 ` [PATCH 01/16] inet: Rearrange and sort Makefile variables Arjun Shankar
2023-10-02 14:11 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 02/16] nss: " Arjun Shankar
2023-10-02 14:12 ` Siddhesh Poyarekar
2023-10-02 12:55 ` [PATCH 03/16] Remove 'grp' and merge into 'nss' and 'posix' Arjun Shankar
2023-10-19 17:55 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 04/16] Remove 'gshadow' and merge into 'nss' Arjun Shankar
2023-10-19 18:15 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 05/16] Remove 'pwd' " Arjun Shankar
2023-10-19 18:29 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 06/16] Remove 'shadow' " Arjun Shankar
2023-10-19 18:44 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 07/16] Move 'aliases' routines from 'inet' " Arjun Shankar
2023-10-19 19:23 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 08/16] Move 'ethers' " Arjun Shankar
2023-10-19 19:39 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 09/16] Move 'hosts' " Arjun Shankar
2023-10-19 19:53 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 10/16] Move 'netgroup' " Arjun Shankar
2023-10-20 12:00 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 11/16] Move 'networks' " Arjun Shankar
2023-10-20 12:17 ` Adhemerval Zanella Netto [this message]
2023-10-02 12:55 ` [PATCH 12/16] Move 'protocols' " Arjun Shankar
2023-10-20 12:32 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 13/16] Move 'rpc' " Arjun Shankar
2023-10-20 12:49 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 14/16] Move 'services' " Arjun Shankar
2023-10-20 13:19 ` Adhemerval Zanella Netto
2023-10-02 12:55 ` [PATCH 15/16] Move getaddrinfo from 'posix' " Arjun Shankar
2023-10-20 13:51 ` Adhemerval Zanella Netto
2023-10-24 21:32 ` Joseph Myers
2023-10-26 10:58 ` Arjun Shankar
2023-10-02 12:55 ` [PATCH 16/16] Move getnameinfo from 'inet' to 'nss' Arjun Shankar
2023-10-20 15:08 ` Adhemerval Zanella Netto
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=99b2c980-513c-4a79-8e02-e6511c95e7a0@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=arjun@redhat.com \
--cc=libc-alpha@sourceware.org \
/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).