From 4298586619e4a8cf4ba0a5a9da31ae80efac173c Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Mon, 2 Oct 2023 14:55:19 +0200 Subject: Move 'aliases' routines from 'inet' into 'nss' The aliases routines are entry points for nss functionality. This commit moves aliases.h and the aliases routines from the 'inet' subdirectory to 'nss', and adjusts any external references. Reviewed-by: Adhemerval Zanella --- inet/Makefile | 7 ------ inet/Versions | 1 - inet/aliases.h | 63 --------------------------------------------------- inet/getaliasent.c | 28 ----------------------- inet/getaliasent_r.c | 30 ------------------------ inet/getaliasname.c | 31 ------------------------- inet/getaliasname_r.c | 30 ------------------------ 7 files changed, 190 deletions(-) delete mode 100644 inet/aliases.h delete mode 100644 inet/getaliasent.c delete mode 100644 inet/getaliasent_r.c delete mode 100644 inet/getaliasname.c delete mode 100644 inet/getaliasname_r.c (limited to 'inet') diff --git a/inet/Makefile b/inet/Makefile index 9db7f941c6..bd3dc58322 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -24,7 +24,6 @@ include ../Makeconfig headers := \ $(wildcard arpa/*.h protocols/*.h) \ - aliases.h \ bits/in.h \ ifaddrs.h \ netinet/ether.h \ @@ -49,10 +48,6 @@ routines := \ ether_ntoa \ ether_ntoa_r \ ether_ntoh \ - getaliasent \ - getaliasent_r \ - getaliasname \ - getaliasname_r \ gethstbyad \ gethstbyad_r \ gethstbynm \ @@ -176,8 +171,6 @@ CFLAGS-getnetbyad_r.c += -fexceptions CFLAGS-getnetbyad.c += -fexceptions CFLAGS-getnetent_r.c += -fexceptions CFLAGS-getnetent.c += -fexceptions -CFLAGS-getaliasent_r.c += -fexceptions -CFLAGS-getaliasent.c += -fexceptions CFLAGS-getrpcent_r.c += -fexceptions CFLAGS-getrpcent.c += -fexceptions CFLAGS-getservent_r.c += -fexceptions diff --git a/inet/Versions b/inet/Versions index 84cbe847cd..e6d1e6f1ba 100644 --- a/inet/Versions +++ b/inet/Versions @@ -14,7 +14,6 @@ libc { ether_ntoa_r; ether_ntohost; # g* - getaliasbyname; getaliasbyname_r; getaliasent; getaliasent_r; getdomainname; gethostbyaddr; gethostbyaddr_r; gethostbyname; gethostbyname2; gethostbyname2_r; gethostbyname_r; gethostent; gethostent_r; getnetbyaddr; getnetbyaddr_r; getnetbyname; diff --git a/inet/aliases.h b/inet/aliases.h deleted file mode 100644 index bdd704ac6f..0000000000 --- a/inet/aliases.h +++ /dev/null @@ -1,63 +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 - . */ - -#ifndef _ALIASES_H -#define _ALIASES_H 1 - -#include - -#include - - -__BEGIN_DECLS - -/* Structure to represent one entry of the alias database. */ -struct aliasent - { - char *alias_name; - size_t alias_members_len; - char **alias_members; - int alias_local; - }; - - -/* Open alias data base files. */ -extern void setaliasent (void) __THROW; - -/* Close alias database files. */ -extern void endaliasent (void) __THROW; - -/* Get the next entry from the alias database. */ -extern struct aliasent *getaliasent (void) __THROW; - -/* Get the next entry from the alias database and put it in RESULT_BUF. */ -extern int getaliasent_r (struct aliasent *__restrict __result_buf, - char *__restrict __buffer, size_t __buflen, - struct aliasent **__restrict __result) __THROW; - -/* Get alias entry corresponding to NAME. */ -extern struct aliasent *getaliasbyname (const char *__name) __THROW; - -/* Get alias entry corresponding to NAME and put it in RESULT_BUF. */ -extern int getaliasbyname_r (const char *__restrict __name, - struct aliasent *__restrict __result_buf, - char *__restrict __buffer, size_t __buflen, - struct aliasent **__restrict __result) __THROW; - -__END_DECLS - -#endif /* aliases.h */ diff --git a/inet/getaliasent.c b/inet/getaliasent.c deleted file mode 100644 index 16ec063d1e..0000000000 --- a/inet/getaliasent.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 aliasent -#define GETFUNC_NAME getaliasent -#define BUFLEN 1024 - -/* There is no nscd support for the aliases file. */ -#undef USE_NSCD - -#include "../nss/getXXent.c" diff --git a/inet/getaliasent_r.c b/inet/getaliasent_r.c deleted file mode 100644 index 8ce9d3a58c..0000000000 --- a/inet/getaliasent_r.c +++ /dev/null @@ -1,30 +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 aliasent -#define SETFUNC_NAME setaliasent -#define GETFUNC_NAME getaliasent -#define ENDFUNC_NAME endaliasent -#define DATABASE_NAME aliases - -/* There is no nscd support for the aliases file. */ -#undef USE_NSCD - -#include "../nss/getXXent_r.c" diff --git a/inet/getaliasname.c b/inet/getaliasname.c deleted file mode 100644 index 3687467fe2..0000000000 --- a/inet/getaliasname.c +++ /dev/null @@ -1,31 +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 aliasent -#define FUNCTION_NAME getaliasbyname -#define DATABASE_NAME aliases -#define ADD_PARAMS const char *name -#define ADD_VARIABLES name -#define BUFLEN 1024 - -/* There is no nscd support for the aliases file. */ -#undef USE_NSCD - -#include "../nss/getXXbyYY.c" diff --git a/inet/getaliasname_r.c b/inet/getaliasname_r.c deleted file mode 100644 index 85f3d89006..0000000000 --- a/inet/getaliasname_r.c +++ /dev/null @@ -1,30 +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 aliasent -#define FUNCTION_NAME getaliasbyname -#define DATABASE_NAME aliases -#define ADD_PARAMS const char *name -#define ADD_VARIABLES name - -/* There is no nscd support for the aliases file. */ -#undef USE_NSCD - -#include "../nss/getXXbyYY_r.c" -- cgit 1.4.1