|
 |
147e83 |
commit 2aac0a862334f3370a7e0b6bc7a53cf0ab847182
|
|
|
147e83 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
147e83 |
Date: Thu Jun 26 14:10:07 2014 +0530
|
|
|
147e83 |
|
|
|
147e83 |
Fix Wundef warning for SEPARATE_KEY
|
|
|
147e83 |
|
|
|
147e83 |
The SEPARATE_KEY macro is never defined in any condition or
|
|
|
147e83 |
architecture. It is effectively dead code, so remove it.
|
|
|
147e83 |
|
|
|
147e83 |
diff --git a/nscd/connections.c b/nscd/connections.c
|
|
|
147e83 |
index 57cb8c180e8e6402..53813cf58876eae7 100644
|
|
|
147e83 |
--- a/nscd/connections.c
|
|
|
147e83 |
+++ b/nscd/connections.c
|
|
|
147e83 |
@@ -317,12 +317,6 @@ enum usekey
|
|
|
147e83 |
use_he = 1,
|
|
|
147e83 |
use_he_begin = use_he | use_begin,
|
|
|
147e83 |
use_he_end = use_he | use_end,
|
|
|
147e83 |
-#if SEPARATE_KEY
|
|
|
147e83 |
- use_key = 2,
|
|
|
147e83 |
- use_key_begin = use_key | use_begin,
|
|
|
147e83 |
- use_key_end = use_key | use_end,
|
|
|
147e83 |
- use_key_first = use_key_begin | use_first,
|
|
|
147e83 |
-#endif
|
|
|
147e83 |
use_data = 3,
|
|
|
147e83 |
use_data_begin = use_data | use_begin,
|
|
|
147e83 |
use_data_end = use_data | use_end,
|
|
|
147e83 |
@@ -471,16 +465,7 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
|
|
|
147e83 |
if (here->key < here->packet + sizeof (struct datahead)
|
|
|
147e83 |
|| here->key > here->packet + dh->allocsize
|
|
|
147e83 |
|| here->key + here->len > here->packet + dh->allocsize)
|
|
|
147e83 |
- {
|
|
|
147e83 |
-#if SEPARATE_KEY
|
|
|
147e83 |
- /* If keys can appear outside of data, this should be done
|
|
|
147e83 |
- instead. But gc doesn't mark the data in that case. */
|
|
|
147e83 |
- if (! check_use (data, head->first_free, usemap,
|
|
|
147e83 |
- use_key | (here->first ? use_first : 0),
|
|
|
147e83 |
- here->key, here->len))
|
|
|
147e83 |
-#endif
|
|
|
147e83 |
- goto fail;
|
|
|
147e83 |
- }
|
|
|
147e83 |
+ goto fail;
|
|
|
147e83 |
|
|
|
147e83 |
work = here->next;
|
|
|
147e83 |
|
|
|
147e83 |
@@ -500,10 +485,6 @@ verify_persistent_db (void *mem, struct database_pers_head *readhead, int dbnr)
|
|
|
147e83 |
he->first == true hashentry. */
|
|
|
147e83 |
for (ref_t idx = 0; idx < head->first_free; ++idx)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#if SEPARATE_KEY
|
|
|
147e83 |
- if (usemap[idx] == use_key_begin)
|
|
|
147e83 |
- goto fail;
|
|
|
147e83 |
-#endif
|
|
|
147e83 |
if (usemap[idx] == use_data_begin)
|
|
|
147e83 |
goto fail;
|
|
|
147e83 |
}
|