diff mbox series

[09/16] Move 'hosts' routines from 'inet' into 'nss'

Message ID	20231002130150.1497733-10-arjun@redhat.com (mailing list archive)
State	Committed
Commit	a7e8d0b90bc400b4d57afb01c1a54236a5c4754c
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D672385F015 From: Arjun Shankar <arjun@redhat.com> To: libc-alpha@sourceware.org, Arjun Shankar <arjun@redhat.com> Subject: [PATCH 09/16] Move 'hosts' routines from 'inet' into 'nss' Date: Mon, 2 Oct 2023 14:55:21 +0200 Message-ID: <20231002130150.1497733-10-arjun@redhat.com> In-Reply-To: <20231002130150.1497733-1-arjun@redhat.com> References: <20231002130150.1497733-1-arjun@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Precedence: list Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org
Series	Consolidate NSS functionality into nss subdir \| [00/16] Consolidate NSS functionality into nss subdir [01/16] inet: Rearrange and sort Makefile variables [02/16] nss: Rearrange and sort Makefile variables [03/16] Remove 'grp' and merge into 'nss' and 'posix' [04/16] Remove 'gshadow' and merge into 'nss' [05/16] Remove 'pwd' and merge into 'nss' [06/16] Remove 'shadow' and merge into 'nss' [07/16] Move 'aliases' routines from 'inet' into 'nss' [08/16] Move 'ethers' routines from 'inet' into 'nss' [09/16] Move 'hosts' routines from 'inet' into 'nss' [10/16] Move 'netgroup' routines from 'inet' into 'nss' [11/16] Move 'networks' routines from 'inet' into 'nss' [12/16] Move 'protocols' routines from 'inet' into 'nss' [13/16] Move 'rpc' routines from 'inet' into 'nss' [14/16] Move 'services' routines from 'inet' into 'nss' [15/16] Move getaddrinfo from 'posix' into 'nss' [16/16] Move getnameinfo from 'inet' to 'nss'

Checks

Context	Check	Description
redhat-pt-bot/TryBot-apply_patch	success	Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-arm	success	Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64	success	Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm	fail	Testing failed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64	success	Testing passed

Commit Message

Arjun Shankar Oct. 2, 2023, 12:55 p.m. UTC

  The gethostby* and gethostent* routines are entry points for nss
functionality.  This commit moves them from the 'inet' subdirectory to
'nss'.
---
 inet/Makefile                 | 17 -----------------
 inet/Versions                 |  4 +---
 nss/Makefile                  | 24 ++++++++++++++++++++++++
 nss/Versions                  |  2 ++
 {inet => nss}/gethstbyad.c    |  0
 {inet => nss}/gethstbyad_r.c  |  0
 {inet => nss}/gethstbynm.c    |  0
 {inet => nss}/gethstbynm2.c   |  0
 {inet => nss}/gethstbynm2_r.c |  0
 {inet => nss}/gethstbynm_r.c  |  0
 {inet => nss}/gethstent.c     |  0
 {inet => nss}/gethstent_r.c   |  0
 {inet => nss}/tst-gethnm.c    |  0
 13 files changed, 27 insertions(+), 20 deletions(-)
 rename {inet => nss}/gethstbyad.c (100%)
 rename {inet => nss}/gethstbyad_r.c (100%)
 rename {inet => nss}/gethstbynm.c (100%)
 rename {inet => nss}/gethstbynm2.c (100%)
 rename {inet => nss}/gethstbynm2_r.c (100%)
 rename {inet => nss}/gethstbynm_r.c (100%)
 rename {inet => nss}/gethstent.c (100%)
 rename {inet => nss}/gethstent_r.c (100%)
 rename {inet => nss}/tst-gethnm.c (100%)

Comments

Adhemerval Zanella Oct. 19, 2023, 7:53 p.m. UTC | #1

On 02/10/23 09:55, Arjun Shankar wrote:
> The gethostby* and gethostent* 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                 | 17 -----------------
>  inet/Versions                 |  4 +---
>  nss/Makefile                  | 24 ++++++++++++++++++++++++
>  nss/Versions                  |  2 ++
>  {inet => nss}/gethstbyad.c    |  0
>  {inet => nss}/gethstbyad_r.c  |  0
>  {inet => nss}/gethstbynm.c    |  0
>  {inet => nss}/gethstbynm2.c   |  0
>  {inet => nss}/gethstbynm2_r.c |  0
>  {inet => nss}/gethstbynm_r.c  |  0
>  {inet => nss}/gethstent.c     |  0
>  {inet => nss}/gethstent_r.c   |  0
>  {inet => nss}/tst-gethnm.c    |  0
>  13 files changed, 27 insertions(+), 20 deletions(-)
>  rename {inet => nss}/gethstbyad.c (100%)
>  rename {inet => nss}/gethstbyad_r.c (100%)
>  rename {inet => nss}/gethstbynm.c (100%)
>  rename {inet => nss}/gethstbynm2.c (100%)
>  rename {inet => nss}/gethstbynm2_r.c (100%)
>  rename {inet => nss}/gethstbynm_r.c (100%)
>  rename {inet => nss}/gethstent.c (100%)
>  rename {inet => nss}/gethstent_r.c (100%)
>  rename {inet => nss}/tst-gethnm.c (100%)
> 
> diff --git a/inet/Makefile b/inet/Makefile
> index 4d053de748..d378542549 100644
> --- a/inet/Makefile
> +++ b/inet/Makefile
> @@ -46,14 +46,6 @@ routines := \
>    ether_line \
>    ether_ntoa \
>    ether_ntoa_r \
> -  gethstbyad \
> -  gethstbyad_r \
> -  gethstbynm \
> -  gethstbynm2 \
> -  gethstbynm2_r \
> -  gethstbynm_r \
> -  gethstent \
> -  gethstent_r \
>    getipv4sourcefilter \
>    getnameinfo \
>    getnetbyad \
> @@ -123,7 +115,6 @@ tests := \
>    tst-checks-posix \
>    tst-ether_aton \
>    tst-ether_line \
> -  tst-gethnm \
>    tst-getni1 \
>    tst-getni2 \
>    tst-if_index-long \
> @@ -154,14 +145,6 @@ include ../gen-locales.mk
>  
>  ifeq ($(have-thread-library),yes)
>  
> -CFLAGS-gethstbyad_r.c += -fexceptions
> -CFLAGS-gethstbyad.c += -fexceptions
> -CFLAGS-gethstbynm_r.c += -fexceptions
> -CFLAGS-gethstbynm.c += -fexceptions
> -CFLAGS-gethstbynm2_r.c += -fexceptions
> -CFLAGS-gethstbynm2.c += -fexceptions
> -CFLAGS-gethstent_r.c += -fexceptions
> -CFLAGS-gethstent.c += -fexceptions
>  CFLAGS-rcmd.c += -fexceptions
>  CFLAGS-getnetbynm_r.c += -fexceptions
>  CFLAGS-getnetbynm.c += -fexceptions
> diff --git a/inet/Versions b/inet/Versions
> index a7c1a0fb6f..d937e9835c 100644
> --- a/inet/Versions
> +++ b/inet/Versions
> @@ -14,9 +14,7 @@ libc {
>      ether_ntoa_r;
>  
>      # g*
> -    getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
> -    gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent;
> -    gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname;
> +    getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname;
>      getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r;
>      getprotobyname; getprotobyname_r; getprotobynumber;
>      getprotobynumber_r; getprotoent; getprotoent_r;
> diff --git a/nss/Makefile b/nss/Makefile
> index 148c6dc1cf..d0b564a033 100644
> --- a/nss/Makefile
> +++ b/nss/Makefile
> @@ -125,6 +125,29 @@ CFLAGS-getsgnam.c += -fexceptions
>  CFLAGS-getsgnam_r.c += -fexceptions
>  endif
>  
> +# hosts routines:
> +routines += \
> +  gethstbyad \
> +  gethstbyad_r \
> +  gethstbynm \
> +  gethstbynm2 \
> +  gethstbynm2_r \
> +  gethstbynm_r \
> +  gethstent \
> +  gethstent_r \
> +  # routines
> +
> +ifeq ($(have-thread-library),yes)
> +CFLAGS-gethstbyad.c += -fexceptions
> +CFLAGS-gethstbyad_r.c += -fexceptions
> +CFLAGS-gethstbynm.c += -fexceptions
> +CFLAGS-gethstbynm_r.c += -fexceptions
> +CFLAGS-gethstbynm2.c += -fexceptions
> +CFLAGS-gethstbynm2_r.c += -fexceptions
> +CFLAGS-gethstent.c += -fexceptions
> +CFLAGS-gethstent_r.c += -fexceptions
> +endif
> +
>  # pwd routines:
>  routines += \
>    fgetpwent \
> @@ -210,6 +233,7 @@ tests := \
>    test-netdb \
>    testgrp \
>    tst-fgetsgent_r \
> +  tst-gethnm \
>    tst-getpw \
>    tst-gshadow \
>    tst-nss-getpwent \
> diff --git a/nss/Versions b/nss/Versions
> index 99208cb9df..74ba4470d8 100644
> --- a/nss/Versions
> +++ b/nss/Versions
> @@ -21,6 +21,8 @@ libc {
>      getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
>      getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
>      getgroups;
> +    gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2;
> +    gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r;
>      getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
>      getspent; getspent_r; getspnam; getspnam_r;
>  
> diff --git a/inet/gethstbyad.c b/nss/gethstbyad.c
> similarity index 100%
> rename from inet/gethstbyad.c
> rename to nss/gethstbyad.c
> diff --git a/inet/gethstbyad_r.c b/nss/gethstbyad_r.c
> similarity index 100%
> rename from inet/gethstbyad_r.c
> rename to nss/gethstbyad_r.c
> diff --git a/inet/gethstbynm.c b/nss/gethstbynm.c
> similarity index 100%
> rename from inet/gethstbynm.c
> rename to nss/gethstbynm.c
> diff --git a/inet/gethstbynm2.c b/nss/gethstbynm2.c
> similarity index 100%
> rename from inet/gethstbynm2.c
> rename to nss/gethstbynm2.c
> diff --git a/inet/gethstbynm2_r.c b/nss/gethstbynm2_r.c
> similarity index 100%
> rename from inet/gethstbynm2_r.c
> rename to nss/gethstbynm2_r.c
> diff --git a/inet/gethstbynm_r.c b/nss/gethstbynm_r.c
> similarity index 100%
> rename from inet/gethstbynm_r.c
> rename to nss/gethstbynm_r.c
> diff --git a/inet/gethstent.c b/nss/gethstent.c
> similarity index 100%
> rename from inet/gethstent.c
> rename to nss/gethstent.c
> diff --git a/inet/gethstent_r.c b/nss/gethstent_r.c
> similarity index 100%
> rename from inet/gethstent_r.c
> rename to nss/gethstent_r.c
> diff --git a/inet/tst-gethnm.c b/nss/tst-gethnm.c
> similarity index 100%
> rename from inet/tst-gethnm.c
> rename to nss/tst-gethnm.c

diff mbox series

Patch

diff --git a/inet/Makefile b/inet/Makefile
index 4d053de748..d378542549 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -46,14 +46,6 @@  routines := \
   ether_line \
   ether_ntoa \
   ether_ntoa_r \
-  gethstbyad \
-  gethstbyad_r \
-  gethstbynm \
-  gethstbynm2 \
-  gethstbynm2_r \
-  gethstbynm_r \
-  gethstent \
-  gethstent_r \
   getipv4sourcefilter \
   getnameinfo \
   getnetbyad \
@@ -123,7 +115,6 @@  tests := \
   tst-checks-posix \
   tst-ether_aton \
   tst-ether_line \
-  tst-gethnm \
   tst-getni1 \
   tst-getni2 \
   tst-if_index-long \
@@ -154,14 +145,6 @@  include ../gen-locales.mk
 
 ifeq ($(have-thread-library),yes)
 
-CFLAGS-gethstbyad_r.c += -fexceptions
-CFLAGS-gethstbyad.c += -fexceptions
-CFLAGS-gethstbynm_r.c += -fexceptions
-CFLAGS-gethstbynm.c += -fexceptions
-CFLAGS-gethstbynm2_r.c += -fexceptions
-CFLAGS-gethstbynm2.c += -fexceptions
-CFLAGS-gethstent_r.c += -fexceptions
-CFLAGS-gethstent.c += -fexceptions
 CFLAGS-rcmd.c += -fexceptions
 CFLAGS-getnetbynm_r.c += -fexceptions
 CFLAGS-getnetbynm.c += -fexceptions
diff --git a/inet/Versions b/inet/Versions
index a7c1a0fb6f..d937e9835c 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -14,9 +14,7 @@  libc {
     ether_ntoa_r;
 
     # g*
-    getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
-    gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent;
-    gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname;
+    getdomainname; getnetbyaddr; getnetbyaddr_r; getnetbyname;
     getnetbyname_r; getnetent; getnetent_r; getnetgrent; getnetgrent_r;
     getprotobyname; getprotobyname_r; getprotobynumber;
     getprotobynumber_r; getprotoent; getprotoent_r;
diff --git a/nss/Makefile b/nss/Makefile
index 148c6dc1cf..d0b564a033 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -125,6 +125,29 @@  CFLAGS-getsgnam.c += -fexceptions
 CFLAGS-getsgnam_r.c += -fexceptions
 endif
 
+# hosts routines:
+routines += \
+  gethstbyad \
+  gethstbyad_r \
+  gethstbynm \
+  gethstbynm2 \
+  gethstbynm2_r \
+  gethstbynm_r \
+  gethstent \
+  gethstent_r \
+  # routines
+
+ifeq ($(have-thread-library),yes)
+CFLAGS-gethstbyad.c += -fexceptions
+CFLAGS-gethstbyad_r.c += -fexceptions
+CFLAGS-gethstbynm.c += -fexceptions
+CFLAGS-gethstbynm_r.c += -fexceptions
+CFLAGS-gethstbynm2.c += -fexceptions
+CFLAGS-gethstbynm2_r.c += -fexceptions
+CFLAGS-gethstent.c += -fexceptions
+CFLAGS-gethstent_r.c += -fexceptions
+endif
+
 # pwd routines:
 routines += \
   fgetpwent \
@@ -210,6 +233,7 @@  tests := \
   test-netdb \
   testgrp \
   tst-fgetsgent_r \
+  tst-gethnm \
   tst-getpw \
   tst-gshadow \
   tst-nss-getpwent \
diff --git a/nss/Versions b/nss/Versions
index 99208cb9df..74ba4470d8 100644
--- a/nss/Versions
+++ b/nss/Versions
@@ -21,6 +21,8 @@  libc {
     getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r;
     getgrent; getgrent_r; getgrgid; getgrgid_r; getgrnam; getgrnam_r;
     getgroups;
+    gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2;
+    gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r;
     getpw; getpwent; getpwent_r; getpwnam; getpwnam_r; getpwuid; getpwuid_r;
     getspent; getspent_r; getspnam; getspnam_r;
 
diff --git a/inet/gethstbyad.c b/nss/gethstbyad.c
similarity index 100%
rename from inet/gethstbyad.c
rename to nss/gethstbyad.c
diff --git a/inet/gethstbyad_r.c b/nss/gethstbyad_r.c
similarity index 100%
rename from inet/gethstbyad_r.c
rename to nss/gethstbyad_r.c
diff --git a/inet/gethstbynm.c b/nss/gethstbynm.c
similarity index 100%
rename from inet/gethstbynm.c
rename to nss/gethstbynm.c
diff --git a/inet/gethstbynm2.c b/nss/gethstbynm2.c
similarity index 100%
rename from inet/gethstbynm2.c
rename to nss/gethstbynm2.c
diff --git a/inet/gethstbynm2_r.c b/nss/gethstbynm2_r.c
similarity index 100%
rename from inet/gethstbynm2_r.c
rename to nss/gethstbynm2_r.c
diff --git a/inet/gethstbynm_r.c b/nss/gethstbynm_r.c
similarity index 100%
rename from inet/gethstbynm_r.c
rename to nss/gethstbynm_r.c
diff --git a/inet/gethstent.c b/nss/gethstent.c
similarity index 100%
rename from inet/gethstent.c
rename to nss/gethstent.c
diff --git a/inet/gethstent_r.c b/nss/gethstent_r.c
similarity index 100%
rename from inet/gethstent_r.c
rename to nss/gethstent_r.c
diff --git a/inet/tst-gethnm.c b/nss/tst-gethnm.c
similarity index 100%
rename from inet/tst-gethnm.c
rename to nss/tst-gethnm.c