lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-11-28 23:44:09 +03:00
Code Activity

nss: Remove effectively unused __nss_*_database variables

Browse Source 
Use of this cache was removed in commit f8847d83e1
("nsswitch: use new internal API (core)").

Reviewed-by: Collin Funk <collin.funk1@gmail.com>
This commit is contained in:
Florian Weimer
2025-11-18 20:18:06 +01:00
parent fd1d642ef8
commit cdb0e9dc70
6 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nss/XXX-lookup.c
View File

@@ -41,19 +41,15 @@
#define CONCAT2_1(Pre, Name) CONCAT2_2 (Pre, Name) #define CONCAT2_1(Pre, Name) CONCAT2_2 (Pre, Name)
#define CONCAT2_2(Pre, Name) Pre##Name #define CONCAT2_2(Pre, Name) Pre##Name
#define DATABASE_NAME_SYMBOL CONCAT3_1 (__nss_, DATABASE_NAME, _database)
#define DATABASE_NAME_STRING STRINGIFY1 (DATABASE_NAME)
#define STRINGIFY1(Name) STRINGIFY2 (Name)
#define STRINGIFY2(Name) #Name
int int
DB_LOOKUP_FCT (nss_action_list *ni, const char *fct_name, const char *fct2_name, DB_LOOKUP_FCT (nss_action_list *ni, const char *fct_name, const char *fct2_name,
void **fctp) void **fctp)
{ {
if (! __nss_database_get (DATABASE_NAME_ID, &DATABASE_NAME_SYMBOL)) nss_action_list actions;
if (! __nss_database_get (DATABASE_NAME_ID, &actions))
return -1; return -1;
*ni = DATABASE_NAME_SYMBOL; *ni = actions;
/* We want to know about it if we've somehow got a NULL action list; /* We want to know about it if we've somehow got a NULL action list;
in the past, we had bad state if seccomp interfered with setup. */ in the past, we had bad state if seccomp interfered with setup. */

8
nss/nsswitch.c
View File

@@ -42,14 +42,6 @@
#include <sysdep.h> #include <sysdep.h>
#include <config.h> #include <config.h>
/* Declare external database variables. */
#define DEFINE_DATABASE(name) \
nss_action_list __nss_##name##_database attribute_hidden; \
weak_extern (__nss_##name##_database)
#include "databases.def"
#undef DEFINE_DATABASE
#ifdef USE_NSCD #ifdef USE_NSCD
/* Flags whether custom rules for database is set. */ /* Flags whether custom rules for database is set. */
bool __nss_database_custom[NSS_DBSIDX_max]; bool __nss_database_custom[NSS_DBSIDX_max];

1
nss/nsswitch.h
View File

@@ -185,7 +185,6 @@ libc_hidden_proto (__nss_hostname_digits_dots)
/* Prototypes for __nss_*_lookup2 functions. */ /* Prototypes for __nss_*_lookup2 functions. */
#define DEFINE_DATABASE(arg) \ #define DEFINE_DATABASE(arg) \
extern struct nss_action *__nss_##arg##_database attribute_hidden; \
int __nss_##arg##_lookup2 (struct nss_action **, const char *, \ int __nss_##arg##_lookup2 (struct nss_action **, const char *, \
const char *, void **); \ const char *, void **); \
libc_hidden_proto (__nss_##arg##_lookup2) libc_hidden_proto (__nss_##arg##_lookup2)

2
nss/tst-rfc3484-2.c
View File

@@ -59,8 +59,6 @@ _res_hconf_init (void)
#undef USE_NSCD #undef USE_NSCD
#include "getaddrinfo.c" #include "getaddrinfo.c"
nss_action_list __nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines /* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */ (among other things) the function rfc3484_sort. */

2
nss/tst-rfc3484-3.c
View File

@@ -59,8 +59,6 @@ _res_hconf_init (void)
#undef USE_NSCD #undef USE_NSCD
#include "getaddrinfo.c" #include "getaddrinfo.c"
nss_action_list __nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines /* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */ (among other things) the function rfc3484_sort. */

2
nss/tst-rfc3484.c
View File

@@ -59,8 +59,6 @@ _res_hconf_init (void)
#undef USE_NSCD #undef USE_NSCD
#include "getaddrinfo.c" #include "getaddrinfo.c"
nss_action_list __nss_hosts_database attribute_hidden;
/* This is the beginning of the real test code. The above defines /* This is the beginning of the real test code. The above defines
(among other things) the function rfc3484_sort. */ (among other things) the function rfc3484_sort. */