security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

g10: Use a symbolic constant instead of a literal.

Browse Source 
* g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
(new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
(release_key_hash_table): Likewise.
(test_key_hash_table): Likewise.
(add_key_hash_table): Likewise.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-09-01 10:40:04 +02:00
parent ee7ec1256b
commit 1f03d4cd94
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
g10/trustdb.c
View File

@ -99,20 +99,22 @@ release_key_items (struct key_item *k)
} }
} }
#define KEY_HASH_TABLE_SIZE 1024
/* /*
* For fast keylook up we need a hash table. Each byte of a KeyIDs * For fast keylook up we need a hash table. Each byte of a KeyID
* should be distributed equally over the 256 possible values (except * should be distributed equally over the 256 possible values (except
* for v3 keyIDs but we consider them as not important here). So we * for v3 keyIDs but we consider them as not important here). So we
* can just use 10 bits to index a table of 1024 key items. * can just use 10 bits to index a table of KEY_HASH_TABLE_SIZE key items.
* Possible optimization: Don not use key_items but other hash_table when the * Possible optimization: Do not use key_items but other hash_table when the
* duplicates lists gets too large. * duplicates lists get too large.
*/ */
static KeyHashTable static KeyHashTable
new_key_hash_table (void) new_key_hash_table (void)
{ {
struct key_item **tbl; struct key_item **tbl;
tbl = xmalloc_clear (1024 * sizeof *tbl); tbl = xmalloc_clear (KEY_HASH_TABLE_SIZE * sizeof *tbl);
return tbl; return tbl;
} }
@ -123,7 +125,7 @@ release_key_hash_table (KeyHashTable tbl)
if (!tbl) if (!tbl)
return; return;
for (i=0; i < 1024; i++) for (i=0; i < KEY_HASH_TABLE_SIZE; i++)
release_key_items (tbl[i]); release_key_items (tbl[i]);
xfree (tbl); xfree (tbl);
} }
@ -136,7 +138,7 @@ test_key_hash_table (KeyHashTable tbl, u32 *kid)
{ {
struct key_item *k; struct key_item *k;
for (k = tbl[(kid[1] & 0x03ff)]; k; k = k->next) for (k = tbl[(kid[1] % KEY_HASH_TABLE_SIZE)]; k; k = k->next)
if (k->kid[0] == kid[0] && k->kid[1] == kid[1]) if (k->kid[0] == kid[0] && k->kid[1] == kid[1])
return 1; return 1;
return 0; return 0;
@ -148,17 +150,18 @@ test_key_hash_table (KeyHashTable tbl, u32 *kid)
static void static void
add_key_hash_table (KeyHashTable tbl, u32 *kid) add_key_hash_table (KeyHashTable tbl, u32 *kid)
{ {
int i = kid[1] % KEY_HASH_TABLE_SIZE;
struct key_item *k, *kk; struct key_item *k, *kk;
for (k = tbl[(kid[1] & 0x03ff)]; k; k = k->next) for (k = tbl[i]; k; k = k->next)
if (k->kid[0] == kid[0] && k->kid[1] == kid[1]) if (k->kid[0] == kid[0] && k->kid[1] == kid[1])
return; /* already in table */ return; /* already in table */
kk = new_key_item (); kk = new_key_item ();
kk->kid[0] = kid[0]; kk->kid[0] = kid[0];
kk->kid[1] = kid[1]; kk->kid[1] = kid[1];
kk->next = tbl[(kid[1] & 0x03ff)]; kk->next = tbl[i];
tbl[(kid[1] & 0x03ff)] = kk; tbl[i] = kk;
} }
/* /*