From 1d74d2f042a405982661267394e16126db70dc5f Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Mon, 2 Oct 2023 14:55:26 +0200 Subject: Move 'services' routines from 'inet' into 'nss' The getservby* and getservent* routines are entry points for nss functionality. This commit moves them from the 'inet' subdirectory to 'nss'. Reviewed-by: Adhemerval Zanella --- inet/Makefile | 8 -------- inet/Versions | 6 +----- inet/getservent.c | 25 ------------------------- inet/getservent_r.c | 29 ----------------------------- inet/getsrvbynm.c | 28 ---------------------------- inet/getsrvbynm_r.c | 27 --------------------------- inet/getsrvbypt.c | 28 ---------------------------- inet/getsrvbypt_r.c | 27 --------------------------- 8 files changed, 1 insertion(+), 177 deletions(-) delete mode 100644 inet/getservent.c delete mode 100644 inet/getservent_r.c delete mode 100644 inet/getsrvbynm.c delete mode 100644 inet/getsrvbynm_r.c delete mode 100644 inet/getsrvbypt.c delete mode 100644 inet/getsrvbypt_r.c (limited to 'inet') diff --git a/inet/Makefile b/inet/Makefile index 3c1987877a..d275f51b3f 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -48,13 +48,7 @@ routines := \ ether_ntoa_r \ getipv4sourcefilter \ getnameinfo \ - getservent \ - getservent_r \ getsourcefilter \ - getsrvbynm \ - getsrvbynm_r \ - getsrvbypt \ - getsrvbypt_r \ herrno \ herrno-loc \ htonl \ @@ -126,8 +120,6 @@ include ../gen-locales.mk ifeq ($(have-thread-library),yes) CFLAGS-rcmd.c += -fexceptions -CFLAGS-getservent_r.c += -fexceptions -CFLAGS-getservent.c += -fexceptions CFLAGS-either_ntoh.c += -fexceptions CFLAGS-either_hton.c += -fexceptions CFLAGS-in6_addr.c += $(config-cflags-wno-ignored-attributes) diff --git a/inet/Versions b/inet/Versions index c0c64e1543..7765cb7722 100644 --- a/inet/Versions +++ b/inet/Versions @@ -15,8 +15,6 @@ libc { # g* getdomainname; - getservbyname; getservbyname_r; getservbyport; - getservbyport_r; getservent; getservent_r; # h* htonl; htons; @@ -46,9 +44,7 @@ libc { # g* getaliasbyname_r; getaliasent_r; gethostbyaddr_r; gethostbyname2_r; gethostbyname_r; gethostent_r; getnetbyaddr_r; getnetbyname_r; - getnetent_r; getservbyname_r; - getservbyport_r; - getservent_r; + getnetent_r; } GLIBC_2.2 { # i* diff --git a/inet/getservent.c b/inet/getservent.c deleted file mode 100644 index 8acd81ea9a..0000000000 --- a/inet/getservent.c +++ /dev/null @@ -1,25 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define GETFUNC_NAME getservent -#define BUFLEN 1024 - -#include "../nss/getXXent.c" diff --git a/inet/getservent_r.c b/inet/getservent_r.c deleted file mode 100644 index f57a7f24b8..0000000000 --- a/inet/getservent_r.c +++ /dev/null @@ -1,29 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define SETFUNC_NAME setservent -#define GETFUNC_NAME getservent -#define ENDFUNC_NAME endservent -#define DATABASE_NAME services -#define STAYOPEN int stayopen -#define STAYOPEN_VAR stayopen - -#include "../nss/getXXent_r.c" diff --git a/inet/getsrvbynm.c b/inet/getsrvbynm.c deleted file mode 100644 index c90a99da1c..0000000000 --- a/inet/getsrvbynm.c +++ /dev/null @@ -1,28 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define FUNCTION_NAME getservbyname -#define DATABASE_NAME services -#define ADD_PARAMS const char *name, const char *proto -#define ADD_VARIABLES name, proto -#define BUFLEN 1024 - -#include "../nss/getXXbyYY.c" diff --git a/inet/getsrvbynm_r.c b/inet/getsrvbynm_r.c deleted file mode 100644 index e90659477d..0000000000 --- a/inet/getsrvbynm_r.c +++ /dev/null @@ -1,27 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define FUNCTION_NAME getservbyname -#define DATABASE_NAME services -#define ADD_PARAMS const char *name, const char *proto -#define ADD_VARIABLES name, proto - -#include "../nss/getXXbyYY_r.c" diff --git a/inet/getsrvbypt.c b/inet/getsrvbypt.c deleted file mode 100644 index d6292c66d9..0000000000 --- a/inet/getsrvbypt.c +++ /dev/null @@ -1,28 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define FUNCTION_NAME getservbyport -#define DATABASE_NAME services -#define ADD_PARAMS int port, const char *proto -#define ADD_VARIABLES port, proto -#define BUFLEN 1024 - -#include "../nss/getXXbyYY.c" diff --git a/inet/getsrvbypt_r.c b/inet/getsrvbypt_r.c deleted file mode 100644 index c01ea347d5..0000000000 --- a/inet/getsrvbypt_r.c +++ /dev/null @@ -1,27 +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 - . */ - -#include - - -#define LOOKUP_TYPE struct servent -#define FUNCTION_NAME getservbyport -#define DATABASE_NAME services -#define ADD_PARAMS int port, const char *proto -#define ADD_VARIABLES port, proto - -#include "../nss/getXXbyYY_r.c" -- cgit 1.4.1