qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nss: Remove effectively unused struct nss_database_default_cache 

We always start with a zero-initialized cache, so this is completely
ineffective.

Reviewed-by: Collin Funk <collin.funk1@gmail.com>
This commit is contained in:
Florian Weimer 2025-11-17 18:43:50 +01:00
parent a025a9deef
commit 5029b63280
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nss/nss_database.c
View File

@ -105,19 +105,10 @@ static const char per_database_defaults[NSS_DATABASE_COUNT] =
[nss_database_shadow_compat] = nss_database_default_nis, [nss_database_shadow_compat] = nss_database_default_nis,
}; };
struct nss_database_default_cache
{
nss_action_list caches[NSS_DATABASE_DEFAULT_COUNT];
};
static bool static bool
nss_database_select_default (struct nss_database_default_cache *cache, nss_database_select_default (enum nss_database db, nss_action_list *result)
enum nss_database db, nss_action_list *result)
{ {
enum nss_database_default def = per_database_defaults[db]; enum nss_database_default def = per_database_defaults[db];
*result = cache->caches[def];
if (*result != NULL)
return true;
/* Determine the default line string. */ /* Determine the default line string. */
const char *line; const char *line;
@ -337,8 +328,6 @@ nss_database_reload (struct nss_database_data *staging,
/* Apply defaults. */ /* Apply defaults. */
if (ok) if (ok)
{ {
struct nss_database_default_cache cache = { };
/* These three default to other services if the user listed the /* These three default to other services if the user listed the
other service. */ other service. */
@ -365,8 +354,7 @@ nss_database_reload (struct nss_database_data *staging,
for (int i = 0; i < NSS_DATABASE_COUNT; ++i) for (int i = 0; i < NSS_DATABASE_COUNT; ++i)
if (staging->services[i] == NULL) if (staging->services[i] == NULL)
{ {
ok = nss_database_select_default (&cache, i, ok = nss_database_select_default (i, &staging->services[i]);
&staging->services[i]);
if (!ok) if (!ok)
break; break;
} }