Move 'ethers' routines from 'inet' into 'nss'

ether_hostton and ether_ntohost are entry points for nss functionality.
This commit moves them from the 'inet' subdirectory to 'nss', and
adjusts any references accordingly.
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

4 files changed, 2 insertions, 123 deletions

diff --git a/inet/Makefile b/inet/Makefile
index bd3dc58322..4d053de748 100644
--- a/inet/Makefile
+++ b/inet/Makefile
@@ -43,11 +43,9 @@ routines := \
   deadline \
   ether_aton \
   ether_aton_r \
-  ether_hton \
   ether_line \
   ether_ntoa \
   ether_ntoa_r \
-  ether_ntoh \
   gethstbyad \
   gethstbyad_r \
   gethstbynm \
diff --git a/inet/Versions b/inet/Versions
index e6d1e6f1ba..a7c1a0fb6f 100644
--- a/inet/Versions
+++ b/inet/Versions
@@ -10,8 +10,8 @@ libc {
     endaliasent; endhostent; endnetent; endnetgrent; endprotoent; endservent;
 
     # e*
-    ether_aton; ether_aton_r; ether_hostton; ether_line; ether_ntoa;
-    ether_ntoa_r; ether_ntohost;
+    ether_aton; ether_aton_r; ether_line; ether_ntoa;
+    ether_ntoa_r;
 
     # g*
     getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname;
diff --git a/inet/ether_hton.c b/inet/ether_hton.c
deleted file mode 100644
index 1b49a57f48..0000000000
--- a/inet/ether_hton.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright (C) 1996-2023 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <netinet/ether.h>
-#include <netinet/if_ether.h>
-#include <string.h>
-
-#include "../nss/nsswitch.h"
-
-/* Type of the lookup function we need here.  */
-typedef int (*lookup_function) (const char *, struct etherent *, char *, int,
-				int *);
-
-int
-ether_hostton (const char *hostname, struct ether_addr *addr)
-{
-  nss_action_list nip;
-  union
-  {
-    lookup_function f;
-    void *ptr;
-  } fct;
-  int no_more;
-  enum nss_status status = NSS_STATUS_UNAVAIL;
-  struct etherent etherent;
-
-  no_more = __nss_ethers_lookup2 (&nip, "gethostton_r", NULL, &fct.ptr);
-
-  while (no_more == 0)
-    {
-      char buffer[1024];
-
-      status = (*fct.f) (hostname, &etherent, buffer, sizeof buffer, &errno);
-
-      no_more = __nss_next2 (&nip, "gethostton_r", NULL, &fct.ptr, status, 0);
-    }
-
-  if (status == NSS_STATUS_SUCCESS)
-    memcpy (addr, etherent.e_addr.ether_addr_octet,
-	    sizeof (struct ether_addr));
-
-  return status == NSS_STATUS_SUCCESS ? 0 : -1;
-}
diff --git a/inet/ether_ntoh.c b/inet/ether_ntoh.c
deleted file mode 100644
index 9f9d7c1a63..0000000000
--- a/inet/ether_ntoh.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 1996-2023 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <netinet/ether.h>
-#include <netinet/if_ether.h>
-#include <string.h>
-
-#include <nss/nsswitch.h>
-
-
-/* Type of the lookup function we need here.  */
-typedef int (*lookup_function) (const struct ether_addr *, struct etherent *,
-				char *, size_t, int *);
-
-int
-ether_ntohost (char *hostname, const struct ether_addr *addr)
-{
-  nss_action_list nip;
-  union
-  {
-    lookup_function f;
-    void *ptr;
-  } fct;
-  int no_more;
-  enum nss_status status = NSS_STATUS_UNAVAIL;
-  struct etherent etherent;
-
-  no_more = __nss_ethers_lookup2 (&nip, "getntohost_r", NULL, &fct.ptr);
-
-  while (no_more == 0)
-    {
-      char buffer[1024];
-
-      status = (*fct.f) (addr, &etherent, buffer, sizeof buffer, &errno);
-
-      no_more = __nss_next2 (&nip, "getntohost_r", NULL, &fct.ptr, status, 0);
-    }
-
-  if (status == NSS_STATUS_SUCCESS)
-    /* XXX This is a potential cause of trouble because the size of
-       the HOSTNAME buffer is not known but the interface does not
-       provide this information.  */
-    strcpy (hostname, etherent.e_name);
-
-  return status == NSS_STATUS_SUCCESS ? 0 : -1;
-}