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>

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 \

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;

nss/Makefile

@@ -68,6 +68,12 @@ CFLAGS-getaliasent_r.c += -fexceptions
 CFLAGS-getaliasent.c += -fexceptions
 endif
 
+# ethers routines:
+routines += \
+  ether_hton \
+  ether_ntoh \
+  # routines
+
 # grp routines:
 routines += \
   fgetgrent \

nss/Versions

@@ -10,6 +10,7 @@ libc {
     endgrent;
     endpwent;
     endspent;
+    ether_hostton; ether_ntohost;
 
     # f*
     fgetgrent; fgetgrent_r;

nss/ether_hton.c

@@ -20,7 +20,7 @@
 #include <netinet/if_ether.h>
 #include <string.h>
 
-#include "../nss/nsswitch.h"
+#include "nsswitch.h"
 
 /* Type of the lookup function we need here.  */
 typedef int (*lookup_function) (const char *, struct etherent *, char *, int,

nss/ether_ntoh.c

@@ -20,7 +20,7 @@
 #include <netinet/if_ether.h>
 #include <string.h>
 
-#include <nss/nsswitch.h>
+#include <nsswitch.h>
 
 
 /* Type of the lookup function we need here.  */