OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Wundef warning for SEPARATE_KEY 

The SEPARATE_KEY macro is never defined in any condition or
architecture.  It is effectively dead code, so remove it.
This commit is contained in:
Siddhesh Poyarekar 2014-06-26 14:10:07 +05:30
parent d8a483f3ef
commit 2aac0a8623
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-06-26 Siddhesh Poyarekar <siddhesh@redhat.com>
* nscd/connections.c (enum usekey) [SEPARATE_KEY]: Remove
code.
(verify_persistent_db): Likewise.
2014-06-26 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/s390/s390-32/nptl/c++-types.data: Moved ...

21
nscd/connections.c
View File

@ -318,12 +318,6 @@ enum usekey
use_he = 1,
use_he_begin = use_he | use_begin,
use_he_end = use_he | use_end,
#if SEPARATE_KEY
use_key = 2,
use_key_begin = use_key | use_begin,
use_key_end = use_key | use_end,
use_key_first = use_key_begin | use_first,
#endif
use_data = 3,
use_data_begin = use_data | use_begin,
use_data_end = use_data | use_end,
@ -472,16 +466,7 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
if (here->key < here->packet + sizeof (struct datahead)
|| here->key > here->packet + dh->allocsize
|| here->key + here->len > here->packet + dh->allocsize)
{
#if SEPARATE_KEY
/* If keys can appear outside of data, this should be done
instead. But gc doesn't mark the data in that case. */
if (! check_use (data, head->first_free, usemap,
use_key | (here->first ? use_first : 0),
here->key, here->len))
#endif
goto fail;
}
goto fail;
work = here->next;
@ -501,10 +486,6 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
he->first == true hashentry. */
for (ref_t idx = 0; idx < head->first_free; ++idx)
{
#if SEPARATE_KEY
if (usemap[idx] == use_key_begin)
goto fail;
#endif
if (usemap[idx] == use_data_begin)
goto fail;
}