Move getnameinfo from 'inet' to 'nss'

getnameinfo is an entry points for nss functionality. This commit moves it from the 'inet' subdirectory to 'nss'. The corresponding Versions entry is also moved from 'posix' into 'nss'. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
palmer-dabbelt · Oct 24, 2023 · 2f1c665 · 2f1c665
1 parent 7f60225
commit 2f1c665
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/inet/Makefile b/inet/Makefile
@@ -47,7 +47,6 @@ routines := \
   ether_ntoa \
   ether_ntoa_r \
   getipv4sourcefilter \
-  getnameinfo \
   getsourcefilter \
   herrno \
   herrno-loc \

diff --git a/nss/Makefile b/nss/Makefile
@@ -136,6 +136,7 @@ routines += \
   gethstbynm_r \
   gethstent \
   gethstent_r \
+  getnameinfo \
   # routines
 
 ifeq ($(have-thread-library),yes)

diff --git a/nss/Versions b/nss/Versions
@@ -58,6 +58,9 @@ libc {
     ulckpwdf;
   }
   GLIBC_2.1 {
+    # g*
+    getnameinfo;
+
     # p*
     putgrent;
   }

diff --git a/inet/getnameinfo.c → nss/getnameinfo.c b/inet/getnameinfo.c → nss/getnameinfo.c
@@ -71,7 +71,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/utsname.h>
 #include <libc-lock.h>
 #include <scratch_buffer.h>
-#include <net-internal.h>
+#include <inet/net-internal.h>
 #include <set-freeres.h>
 
 #ifndef min

diff --git a/posix/Versions b/posix/Versions
@@ -72,7 +72,7 @@ libc {
     __pread64; __pwrite64;
 
     # g*
-    gai_strerror; getnameinfo; glob64; globfree64;
+    gai_strerror; glob64; globfree64;
 
     # p*
     pread; pread64; pwrite; pwrite64;